Skip to content

Commit f5d8af7

Browse files
bellenotbellenot
authored
Merge branch 'root-project:master' into fix-9354
2 parents c01fa4a + ba2e00f commit f5d8af7

File tree

88 files changed

+339
-395
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+339
-395
lines changed

‎cmake/modules/RootMacros.cmake‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1542,9 +1542,6 @@ function(ROOT_ADD_TEST test)
15421542
find_program(_exe ${_prg})
15431543
if(_exe) # if the command is found in the system, use it
15441544
set(_cmd ${_exe} ${ARG_COMMAND})
1545-
elseif(NOT IS_ABSOLUTE ${_prg}) # if not absolute, assume is found in current binary dir
1546-
set(_prg ${CMAKE_CURRENT_BINARY_DIR}/${_prg})
1547-
set(_cmd ${_prg} ${ARG_COMMAND})
15481545
else() # take as it is
15491546
set(_cmd ${_prg} ${ARG_COMMAND})
15501547
endif()

‎geom/gdml/src/TGDMLWrite.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -763,7 +763,7 @@ void TGDMLWrite::ExtractVolumes(TGeoNode *node)
763763

764764
// export auxiliary user-data if present (TMap of TObjString->TObjString)
765765
{
766-
TGeoRCExtension *rcext = (TGeoRCExtension *)volume->GetUserExtension();
766+
TGeoRCExtension *rcext = dynamic_cast<TGeoRCExtension *>(volume->GetUserExtension());
767767
if (rcext) {
768768
TObject *userObj = rcext->GetUserObject();
769769
if (userObj && userObj->InheritsFrom("TMap")) {

‎io/io/src/TMemFile.cxx‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -348,11 +348,6 @@ void TMemFile::ResetAfterMerge(TFileMergeInfo *info)
348348
fCacheRead = 0;
349349
fCacheWrite = 0;
350350
fReadCalls = 0;
351-
if (fFree) {
352-
fFree->Delete();
353-
delete fFree;
354-
fFree = nullptr;
355-
}
356351

357352
fSysOffset = 0;
358353
fBlockSeek = &fBlockList;
@@ -375,7 +370,6 @@ void TMemFile::ResetAfterMerge(TFileMergeInfo *info)
375370
((TDirectoryFile*)idcur)->ResetAfterMerge(info);
376371
}
377372
}
378-
379373
}
380374
}
381375

‎math/matrix/src/TMatrixT.cxx‎

Lines changed: 126 additions & 81 deletions
Large diffs are not rendered by default.

‎roottest/CMakeLists.txt‎

Lines changed: 30 additions & 179 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,5 @@
1-
cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
2-
3-
project(roottest)
4-
5-
# If no explicit ROOTSYS is set, use ${ROOTSYS} environment variable to search
6-
# for ROOT. This may be set by sourcing thisroot.sh from an installation.
7-
if(NOT DEFINED ROOTSYS AND DEFINED ENV{ROOTSYS})
8-
cmake_path(CONVERT "$ENV{ROOTSYS}" TO_CMAKE_PATH_LIST ROOTSYS)
9-
list(INSERT CMAKE_PREFIX_PATH 0 ${ROOTSYS})
10-
endif()
11-
12-
# Use ${ROOTSYS} CMake variable to search for ROOT. This is set when roottest is
13-
# built as part of ROOT, i.e., when ROOT is configured with -Droottest=ON. It
14-
# may also be set by passing -DROOTSYS=<PATH> to CMake when configuring a
15-
# standalone roottest against an installation of ROOT. If this is set, it takes
16-
# precedence over the environment to ensure that when roottest is being built in
17-
# a ROOT build configured with -Droottest=ON, it will find the ROOT being built,
18-
# and not a ROOT installation sourced with thisroot.sh or found in $PATH.
19-
if(DEFINED ROOTSYS)
20-
list(INSERT CMAKE_PREFIX_PATH 0 ${ROOTSYS})
21-
endif()
22-
231
find_package(ROOT REQUIRED CONFIG)
242

25-
if(NOT DEFINED Python3_EXECUTABLE)
26-
find_package(Python3 ${ROOT_PYTHON_VERSION} REQUIRED QUIET COMPONENTS Interpreter)
27-
endif()
28-
293
if(MSVC)
304
set(CMAKE_SKIP_TEST_ALL_DEPENDENCY TRUE)
315
set(CMAKE_SUPPRESS_REGENERATION TRUE)
@@ -49,72 +23,24 @@ if(MSVC)
4923
if(NOT win_broken_tests)
5024
set(WILLFAIL_ON_WIN32 WILLFAIL)
5125
endif()
52-
if (NOT Python3_EXECUTABLE)
53-
find_package(PythonInterp)
54-
endif()
5526

56-
if(DEFINED ROOT_SOURCE_DIR)
57-
set(CMAKE_CXX_FLAGS ${ROOT_CXX_FLAGS})
58-
# ROOT_BINDIR is set by ROOTConfig.cmake
59-
set(ROOT_CONFIG_EXECUTABLE ${ROOT_BINDIR}/root-config.bat)
60-
execute_process(COMMAND ${ROOT_CONFIG_EXECUTABLE} "--prefix" OUTPUT_VARIABLE ROOTSYS RESULT_VARIABLE RETVAR OUTPUT_STRIP_TRAILING_WHITESPACE)
61-
cmake_path(CONVERT "${ROOTSYS}" TO_CMAKE_PATH_LIST ROOTSYS)
62-
set(ROOTSYS ${ROOTSYS} CACHE INTERNAL "")
63-
execute_process(COMMAND ${ROOT_CONFIG_EXECUTABLE} "--tutdir" OUTPUT_VARIABLE ROOT_TUTORIALS_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
64-
cmake_path(CONVERT "${ROOT_TUTORIALS_DIR}" TO_CMAKE_PATH_LIST ROOT_TUTORIALS_DIR)
65-
set(ROOT_root_CMD ${ROOTSYS}/bin/root.exe)
66-
set(ROOT_hadd_CMD ${ROOTSYS}/bin/hadd.exe)
67-
set(ROOT_genreflex_CMD ${ROOTSYS}/bin/genreflex.exe)
68-
set(ROOT_rootcint_CMD ${ROOTSYS}/bin/rootcint.exe)
69-
set(ROOT_rootcling_CMD ${ROOTSYS}/bin/rootcling.exe)
70-
if(CMAKE_GENERATOR MATCHES Ninja)
71-
set(ROOT_LIBRARIES Core RIO Net Hist Gpad Graf Tree Rint Matrix MathCore)
72-
else()
73-
set(ROOT_LIBRARIES libCore libRIO libNet libHist libGpad libGraf libTree libRint libMatrix libMathCore)
74-
endif()
27+
set(CMAKE_CXX_FLAGS ${ROOT_CXX_FLAGS})
28+
# ROOT_BINDIR is set by ROOTConfig.cmake
29+
set(ROOT_CONFIG_EXECUTABLE ${ROOT_BINDIR}/root-config.bat)
30+
execute_process(COMMAND ${ROOT_CONFIG_EXECUTABLE} "--prefix" OUTPUT_VARIABLE ROOTSYS RESULT_VARIABLE RETVAR OUTPUT_STRIP_TRAILING_WHITESPACE)
31+
cmake_path(CONVERT "${ROOTSYS}" TO_CMAKE_PATH_LIST ROOTSYS)
32+
set(ROOTSYS ${ROOTSYS} CACHE INTERNAL "")
33+
execute_process(COMMAND ${ROOT_CONFIG_EXECUTABLE} "--tutdir" OUTPUT_VARIABLE ROOT_TUTORIALS_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
34+
cmake_path(CONVERT "${ROOT_TUTORIALS_DIR}" TO_CMAKE_PATH_LIST ROOT_TUTORIALS_DIR)
35+
set(ROOT_root_CMD ${ROOTSYS}/bin/root.exe)
36+
set(ROOT_hadd_CMD ${ROOTSYS}/bin/hadd.exe)
37+
set(ROOT_genreflex_CMD ${ROOTSYS}/bin/genreflex.exe)
38+
set(ROOT_rootcint_CMD ${ROOTSYS}/bin/rootcint.exe)
39+
set(ROOT_rootcling_CMD ${ROOTSYS}/bin/rootcling.exe)
40+
if(CMAKE_GENERATOR MATCHES Ninja)
41+
set(ROOT_LIBRARIES Core RIO Net Hist Gpad Graf Tree Rint Matrix MathCore)
7542
else()
76-
include(${ROOT_USE_FILE})
77-
set(ROOT_CONFIG_EXECUTABLE root-config.bat)
78-
execute_process(COMMAND ${ROOT_CONFIG_EXECUTABLE} "--prefix" OUTPUT_VARIABLE ROOTSYS RESULT_VARIABLE RETVAR OUTPUT_STRIP_TRAILING_WHITESPACE)
79-
cmake_path(CONVERT "${ROOTSYS}" TO_CMAKE_PATH_LIST ROOTSYS)
80-
set(ROOTSYS ${ROOTSYS} CACHE INTERNAL "")
81-
execute_process(COMMAND ${ROOT_CONFIG_EXECUTABLE} "--srcdir" OUTPUT_VARIABLE ROOT_SOURCE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
82-
cmake_path(CONVERT "${ROOT_SOURCE_DIR}" TO_CMAKE_PATH_LIST ROOT_SOURCE_DIR)
83-
execute_process(COMMAND ${ROOT_CONFIG_EXECUTABLE} "--tutdir" OUTPUT_VARIABLE ROOT_TUTORIALS_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
84-
cmake_path(CONVERT "${ROOT_TUTORIALS_DIR}" TO_CMAKE_PATH_LIST ROOT_TUTORIALS_DIR)
85-
execute_process(COMMAND ${ROOT_CONFIG_EXECUTABLE} "--features" OUTPUT_VARIABLE ROOT_FEATURES RESULT_VARIABLE RETVAR OUTPUT_STRIP_TRAILING_WHITESPACE)
86-
separate_arguments(ROOT_FEATURES)
87-
foreach(item ${ROOT_FEATURES})
88-
if("${item}" MATCHES "^cxx(.*)")
89-
string(REGEX REPLACE "^cxx(.*)" "\\1" CXX_VERSION ${item})
90-
set(CMAKE_CXX_STANDARD ${CXX_VERSION} CACHE INTERNAL "")
91-
endif()
92-
endforeach()
93-
# Some roottest.git tests are checking LZ4 and ZSTD, which has different references depends on its version.
94-
# We recover LZ4/ZSTD version used in ROOT, stored in root-config --config output.
95-
execute_process(COMMAND ${ROOT_CONFIG_EXECUTABLE} "--config" OUTPUT_VARIABLE ROOT_CONFIG_VARIABLES RESULT_VARIABLE RETVAR OUTPUT_STRIP_TRAILING_WHITESPACE)
96-
separate_arguments(ROOT_CONFIG_VARIABLES)
97-
foreach(item ${ROOT_CONFIG_VARIABLES})
98-
if("${item}" MATCHES "LZ4_VERSION=(.*)")
99-
string(REGEX REPLACE "LZ4_VERSION=(.*)" "\\1" LZ4 ${item})
100-
set(LZ4_VERSION ${LZ4} CACHE INTERNAL "")
101-
elseif("${item}" MATCHES "ZSTD_VERSION=(.*)")
102-
string(REGEX REPLACE "ZSTD_VERSION=(.*)" "\\1" ZSTD ${item})
103-
set(ZSTD_VERSION ${ZSTD} CACHE INTERNAL "")
104-
endif()
105-
endforeach()
106-
if(NOT LZ4_VERSION)
107-
message(FATAL_ERROR "LZ4_VERSION not found in ${ROOTSYS}/bin/root-config.bat")
108-
endif()
109-
if(NOT ZSTD_VERSION)
110-
message(FATAL_ERROR "ZSTD_VERSION not found in ${ROOTSYS}/bin/root-config.bat")
111-
endif()
112-
find_program(ROOT_root_CMD root.exe PATHS ${ROOTSYS}/bin)
113-
find_program(ROOT_hadd_CMD hadd.exe PATHS ${ROOTSYS}/bin)
114-
find_program(ROOT_genreflex_CMD genreflex.exe PATHS ${ROOTSYS}/bin)
115-
find_program(ROOT_rootcint_CMD rootcint.exe PATHS ${ROOTSYS}/bin)
116-
find_program(ROOT_rootcling_CMD rootcling.exe PATHS ${ROOTSYS}/bin)
117-
enable_testing()
43+
set(ROOT_LIBRARIES libCore libRIO libNet libHist libGpad libGraf libTree libRint libMatrix libMathCore)
11844
endif()
11945
else()
12046

@@ -125,83 +51,23 @@ else()
12551
# only for non-Windows platforms
12652
set(OptionalMultiProc MultiProc)
12753

128-
# If ROOT_SOURCE_DIR is set, roottest is built as part of the root build.
129-
# If ROOT_SOURCE_DIR is not set, search for an installation.
130-
if(DEFINED ROOT_SOURCE_DIR)
131-
# root-config --prefix helps to retrieve ROOTSYS env variable.
132-
# ROOT_BINDIR is set by ROOTConfig.cmake
133-
find_program(ROOT_CONFIG_EXECUTABLE root-config PATHS ${ROOT_BINDIR})
134-
if(NOT ROOT_CONFIG_EXECUTABLE)
135-
message(ERROR "root-config is not found, please rerun configuration step.")
136-
endif()
137-
execute_process(COMMAND ${ROOT_CONFIG_EXECUTABLE} "--prefix" OUTPUT_VARIABLE ROOTSYS RESULT_VARIABLE RETVAR OUTPUT_STRIP_TRAILING_WHITESPACE)
138-
set(ROOTSYS ${ROOTSYS} CACHE INTERNAL "")
139-
execute_process(COMMAND ${ROOT_CONFIG_EXECUTABLE} "--tutdir" OUTPUT_VARIABLE ROOT_TUTORIALS_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
140-
set(ROOT_LIBRARIES Core RIO Net Hist Gpad Tree Rint Matrix MathCore)
141-
set(ROOT_root_CMD ${ROOTSYS}/bin/root.exe)
142-
set(ROOT_hadd_CMD ${ROOTSYS}/bin/hadd)
143-
set(ROOT_genreflex_CMD ${ROOTSYS}/bin/genreflex)
144-
set(ROOT_rootcint_CMD ${ROOTSYS}/bin/rootcint)
145-
set(ROOT_rootcling_CMD rootcling)
146-
else() # standalone roottest.git
147-
include(${ROOT_USE_FILE})
148-
# root-config --prefix helps to retrieve ROOTSYS env variable.
149-
find_program(ROOT_CONFIG_EXECUTABLE root-config)
150-
execute_process(COMMAND ${ROOT_CONFIG_EXECUTABLE} "--prefix" OUTPUT_VARIABLE ROOTSYS RESULT_VARIABLE RETVAR OUTPUT_STRIP_TRAILING_WHITESPACE)
151-
set(ROOTSYS ${ROOTSYS} CACHE INTERNAL "")
152-
# Some roottest.git tests are checking LZ4 and ZSTD, which has different references depends on its version.
153-
# We recover LZ4/ZSTD version used in ROOT, stored in root-config --config output.
154-
execute_process(COMMAND ${ROOT_CONFIG_EXECUTABLE} "--srcdir" OUTPUT_VARIABLE ROOT_SOURCE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
155-
execute_process(COMMAND ${ROOT_CONFIG_EXECUTABLE} "--tutdir" OUTPUT_VARIABLE ROOT_TUTORIALS_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
156-
execute_process(COMMAND ${ROOT_CONFIG_EXECUTABLE} "--config" OUTPUT_VARIABLE ROOT_CONFIG_VARIABLES RESULT_VARIABLE RETVAR OUTPUT_STRIP_TRAILING_WHITESPACE)
157-
separate_arguments(ROOT_CONFIG_VARIABLES)
158-
foreach(item ${ROOT_CONFIG_VARIABLES})
159-
if("${item}" MATCHES "LZ4_VERSION=(.*)")
160-
string(REGEX REPLACE "LZ4_VERSION=(.*)" "\\1" LZ4 ${item})
161-
set(LZ4_VERSION ${LZ4} CACHE INTERNAL "")
162-
elseif("${item}" MATCHES "ZSTD_VERSION=(.*)")
163-
string(REGEX REPLACE "ZSTD_VERSION=(.*)" "\\1" ZSTD ${item})
164-
set(ZSTD_VERSION ${ZSTD} CACHE INTERNAL "")
165-
endif()
166-
endforeach()
167-
# If we didn't manage to find LZ4_VERSION/ZSTD_VERSION in "root-config --config" output,
168-
# we consider that ROOT had used system LZ4/ZSTD and we can find it via find_package().
169-
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake/modules ${ROOTSYS}/cmake/modules ${ROOT_SOURCE_DIR}/cmake/modules)
170-
if(NOT LZ4_VERSION)
171-
find_package(LZ4)
172-
if(NOT LZ4_FOUND)
173-
message(FATAL_ERROR "lz4 is required to be installed before running roottest.git")
174-
endif()
175-
endif()
176-
if(NOT ZSTD_VERSION)
177-
find_package(ZSTD)
178-
if(NOT ZSTD_FOUND)
179-
message(FATAL_ERROR "zstd is required to be installed before running roottest.git")
180-
endif()
181-
endif()
182-
# To be able to use the same C++ standard as used in ROOT, we can try to retrieve it from root-config --features
183-
execute_process(COMMAND ${ROOT_CONFIG_EXECUTABLE} "--features" OUTPUT_VARIABLE ROOT_FEATURES RESULT_VARIABLE RETVAR OUTPUT_STRIP_TRAILING_WHITESPACE)
184-
separate_arguments(ROOT_FEATURES)
185-
foreach(item ${ROOT_FEATURES})
186-
if("${item}" MATCHES "^cxx(.*)")
187-
string(REGEX REPLACE "^cxx(.*)" "\\1" CXX_VERSION ${item})
188-
set(CMAKE_CXX_STANDARD ${CXX_VERSION} CACHE INTERNAL "")
189-
endif()
190-
endforeach()
191-
find_program(ROOT_root_CMD root.exe PATHS ${ROOTSYS}/bin)
192-
find_program(ROOT_hadd_CMD hadd PATHS ${ROOTSYS}/bin)
193-
find_program(ROOT_genreflex_CMD genreflex PATHS ${ROOTSYS}/bin)
194-
find_program(ROOT_rootcint_CMD rootcint PATHS ${ROOTSYS}/bin)
195-
find_program(ROOT_rootcling_CMD rootcling PATHS ${ROOTSYS}/bin)
196-
enable_testing()
54+
# root-config --prefix helps to retrieve ROOTSYS env variable.
55+
# ROOT_BINDIR is set by ROOTConfig.cmake
56+
find_program(ROOT_CONFIG_EXECUTABLE root-config PATHS ${ROOT_BINDIR})
57+
if(NOT ROOT_CONFIG_EXECUTABLE)
58+
message(ERROR "root-config is not found, please rerun configuration step.")
19759
endif()
60+
execute_process(COMMAND ${ROOT_CONFIG_EXECUTABLE} "--prefix" OUTPUT_VARIABLE ROOTSYS RESULT_VARIABLE RETVAR OUTPUT_STRIP_TRAILING_WHITESPACE)
61+
set(ROOTSYS ${ROOTSYS} CACHE INTERNAL "")
62+
execute_process(COMMAND ${ROOT_CONFIG_EXECUTABLE} "--tutdir" OUTPUT_VARIABLE ROOT_TUTORIALS_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
63+
set(ROOT_LIBRARIES Core RIO Net Hist Gpad Tree Rint Matrix MathCore)
64+
set(ROOT_root_CMD ${ROOTSYS}/bin/root.exe)
65+
set(ROOT_hadd_CMD ${ROOTSYS}/bin/hadd)
66+
set(ROOT_genreflex_CMD ${ROOTSYS}/bin/genreflex)
67+
set(ROOT_rootcint_CMD ${ROOTSYS}/bin/rootcint)
68+
set(ROOT_rootcling_CMD rootcling)
19869
endif()
19970

200-
# Synchronizing default compression algorithm used for ROOT.
201-
# We need to have it for CMake settings for switching tests references.
202-
# FIXME: it should be exported from ROOT build.
203-
set(compression_default "zlib" CACHE STRING "" FORCE)
204-
20571
get_filename_component(ROOT_LIBRARY_DIR "${ROOTSYS}/lib" ABSOLUTE)
20672

20773
set(ref_suffix ".ref")
@@ -252,21 +118,6 @@ set(CMAKE_ROOTTEST_DICT ON)
252118
# Set the CMake module path. Here are all the custom CMake modules.
253119
set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${ROOT_SOURCE_DIR}/roottest/cmake/modules")
254120

255-
# Find python.
256-
if(ROOT_pyroot_FOUND)
257-
if (NOT Python3_EXECUTABLE)
258-
find_package(PythonInterp)
259-
if(PYTHONINTERP_FOUND)
260-
execute_process(COMMAND ${Python3_EXECUTABLE} -c "import sys;sys.stdout.write(sys.prefix)"
261-
OUTPUT_VARIABLE PYTHON_PREFIX)
262-
set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${PYTHON_PREFIX})
263-
endif()
264-
if (NOT Python3_LIBRARIES)
265-
find_package(PythonLibs)
266-
endif()
267-
endif()
268-
endif()
269-
270121
#---Set flag for PyROOT tests that are expected to fail
271122
if(ROOT_pyroot_FOUND)
272123
set(PYTESTS_WILLFAIL WILLFAIL)

‎roottest/root/aclic/misc/assertmyfun.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class MyFCN: public ROOT::Fit::Chi2Function{
99
~MyFCN(){}
1010
};
1111

12-
#ifdef __MAKECINT__
12+
#ifdef __ROOTCLING__
1313
#pragma link C++ class MyFCN-;
1414
#endif
1515

‎roottest/root/collection/runTExMap.C‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#ifndef __CINT__
1+
#ifndef __CLING__
22

33
#include "TExMap.h"
44
#include "Riostream.h"

‎roottest/root/collection/runTMap.C‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Test object (key,value) ownership behaviour of TMap.
22

3-
#if !defined(__CINT__) || defined(__MAKECINT__)
3+
#if !defined(__CLING__) || defined(__ROOTCLING__)
44
#include "TObjString.h"
55
#include "TMap.h"
66
#include "TObjectSpy.h"

‎roottest/root/collection/runtbits.C‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include "Riostream.h"
33
#include "TRandom.h"
44

5-
#ifndef __CINT__
5+
#ifndef __CLING__
66
#include <bitset>
77
using namespace std;
88
#endif

‎roottest/root/dataframe/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ ROOTTEST_ADD_TEST(test_callables
181181

182182
ROOTTEST_GENERATE_EXECUTABLE(testIMT
183183
testIMT.cxx
184-
LIBRARIES ${DFLIBRARIES}
184+
LIBRARIES ${DFLIBRARIES} GenVector
185185
FIXTURES_SETUP root-dataframe-testIMT-fixture)
186186

187187
ROOTTEST_ADD_TEST(testIMT
@@ -217,7 +217,7 @@ ROOTTEST_ADD_TEST(typeguessing
217217

218218
ROOTTEST_GENERATE_EXECUTABLE(misc
219219
test_misc.cxx
220-
LIBRARIES ${DFLIBRARIES}
220+
LIBRARIES ${DFLIBRARIES} GenVector
221221
FIXTURES_SETUP root-dataframe-misc-fixture)
222222

223223
ROOTTEST_ADD_TEST(misc

0 commit comments

Comments
 (0)