Remove all workarounds wrt cxxmodules.

vgvassilev · vgvassilev · commit 28b4b3bd8446 · 2020-03-27T08:31:10.000+02:00
diff --git a/cling/template/CMakeLists.txt b/cling/template/CMakeLists.txt
@@ -11,9 +11,7 @@ ROOTTEST_ADD_TEST(templateSingleton
                   DEPENDS Singleton.h
                   LABELS roottest regression cling)
 
-if(NOT ROOT_runtime_cxxmodules_FOUND)
-  ROOTTEST_GENERATE_DICTIONARY(slaveDict        slave.h        LINKDEF slaveLinkDef.h)
-endif()
+ROOTTEST_GENERATE_DICTIONARY(slaveDict        slave.h        LINKDEF slaveLinkDef.h)
 ROOTTEST_GENERATE_DICTIONARY(masterDict       master.h       LINKDEF masterLinkDef.h)
 ROOTTEST_GENERATE_DICTIONARY(forwardDict      forward.C      LINKDEF linkdef.h)
 ROOTTEST_GENERATE_DICTIONARY(constructorDict  constructor.hh LINKDEF linkdef.h)
diff --git a/root/tree/CMakeLists.txt b/root/tree/CMakeLists.txt
@@ -1,7 +1,2 @@
-if(ROOT_runtime_cxxmodules_FOUND)
-  set(excluded_rtcxxmod_tests friend fastcloningeventtree)
-  ROOTTEST_ADD_TESTDIRS(EXCLUDED_DIRS ${excluded_rtcxxmod_tests})
-else()
-  set(excluded_tests fastcloningeventtree)
-  ROOTTEST_ADD_TESTDIRS(EXCLUDED_DIRS ${excluded_tests})
-endif()
+set(excluded_tests fastcloningeventtree)
+ROOTTEST_ADD_TESTDIRS(EXCLUDED_DIRS ${excluded_tests})
diff --git a/root/treeformula/sync/CMakeLists.txt b/root/treeformula/sync/CMakeLists.txt
@@ -4,6 +4,4 @@
 # define a CTest test that calls 'make' in ${CMAKE_CURRENT_SOURCE_DIR}
 #
 #-------------------------------------------------------------------------------
-if(NOT ROOT_runtime_cxxmodules_FOUND)
-  ROOTTEST_ADD_OLDTEST()
-endif()
+ROOTTEST_ADD_OLDTEST()

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,4 @@`
`4`	`4`	`# define a CTest test that calls 'make' in ${CMAKE_CURRENT_SOURCE_DIR}`
`5`	`5`	`#`
`6`	`6`	`#-------------------------------------------------------------------------------`
`7`		`-if(NOT ROOT_runtime_cxxmodules_FOUND)`
`8`		`- ROOTTEST_ADD_OLDTEST()`
`9`		`-endif()`
	`7`	`+ROOTTEST_ADD_OLDTEST()`