From b1775ddb56c65b5cf366c8f8db045e4bfc5243ec Mon Sep 17 00:00:00 2001 From: Raphael Isemann Date: Thu, 31 Aug 2017 15:39:16 +0200 Subject: [PATCH] [cxxmodules] Add missing module dependencies to test dictionaries Those dictionaries also generate a C++ module, but we don't specify as of yet the dependencies on the referenced C++ modules from ROOT. --- test/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 9e1e8517ec6db..6cf7e906fdc7a 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -78,15 +78,15 @@ ROOT_EXECUTABLE(vlazy vlazy.cxx LIBRARIES Core Matrix) ROOT_ADD_TEST(test-vlazy COMMAND vlazy) #--helloso------------------------------------------------------------------------------------ -ROOT_GENERATE_DICTIONARY(G__Hello ${CMAKE_CURRENT_SOURCE_DIR}/Hello.h MODULE Hello) +ROOT_GENERATE_DICTIONARY(G__Hello ${CMAKE_CURRENT_SOURCE_DIR}/Hello.h MODULE Hello DEPENDENCIES Gpad Graf Hist MathCore Matrix) ROOT_LINKER_LIBRARY(Hello Hello.cxx G__Hello.cxx LIBRARIES Graf Gpad) #--Aclockso------------------------------------------------------------------------------------ -ROOT_GENERATE_DICTIONARY(G__Aclock ${CMAKE_CURRENT_SOURCE_DIR}/Aclock.h MODULE Aclock) +ROOT_GENERATE_DICTIONARY(G__Aclock ${CMAKE_CURRENT_SOURCE_DIR}/Aclock.h MODULE Aclock DEPENDENCIES Graf Gpad MathCore) ROOT_LINKER_LIBRARY(Aclock Aclock.cxx G__Aclock.cxx LIBRARIES Graf Gpad) #--bench------------------------------------------------------------------------------------ -ROOT_GENERATE_DICTIONARY(G__TBench ${CMAKE_CURRENT_SOURCE_DIR}/TBench.h MODULE TBench LINKDEF benchLinkDef.h) +ROOT_GENERATE_DICTIONARY(G__TBench ${CMAKE_CURRENT_SOURCE_DIR}/TBench.h MODULE TBench LINKDEF benchLinkDef.h DEPENDENCIES MathCore Tree) ROOT_LINKER_LIBRARY(TBench TBench.cxx G__TBench.cxx LIBRARIES Core MathCore RIO Tree) ROOT_EXECUTABLE(bench bench.cxx LIBRARIES Core TBench) ROOT_ADD_TEST(test-bench COMMAND bench LABELS longtest) @@ -176,7 +176,7 @@ ROOT_STANDARD_LIBRARY_PACKAGE(TrackMathCoreDict NO_INSTALL_HEADERS HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/TrackMathCore.h LINKDEF TrackMathCoreLinkDef.h - DEPENDENCIES Core MathCore RIO GenVector) + DEPENDENCIES Core MathCore RIO GenVector Smatrix) ROOT_EXECUTABLE(stressMathCore stressMathCore.cxx LIBRARIES MathCore Hist RIO Tree GenVector) ROOT_ADD_TEST(test-stressmathcore COMMAND stressMathCore FAILREGEX "FAILED|Error in") ROOT_ADD_TEST(test-stressmathcore-interpreted COMMAND ${ROOT_root_CMD} -b -q -l ${CMAKE_CURRENT_SOURCE_DIR}/stressMathCore.cxx