Skip to content

Commit 6ccce25

Browse files
committed
Remove all workarounds wrt cxxmodules.
1 parent 4720f15 commit 6ccce25

File tree

9 files changed

+8
-19
lines changed

9 files changed

+8
-19
lines changed

cling/reflex/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@
44
# define a CTest test that calls 'make' in ${CMAKE_CURRENT_SOURCE_DIR}
55
#
66
#-------------------------------------------------------------------------------
7+
78
ROOTTEST_ADD_OLDTEST(LABELS longtest)

cling/template/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@ ROOTTEST_ADD_TEST(templateSingleton
1111
DEPENDS Singleton.h
1212
LABELS roottest regression cling)
1313

14-
if(NOT ROOT_runtime_cxxmodules_FOUND)
15-
ROOTTEST_GENERATE_DICTIONARY(slaveDict slave.h LINKDEF slaveLinkDef.h)
16-
endif()
14+
ROOTTEST_GENERATE_DICTIONARY(slaveDict slave.h LINKDEF slaveLinkDef.h)
1715
ROOTTEST_GENERATE_DICTIONARY(masterDict master.h LINKDEF masterLinkDef.h)
1816
ROOTTEST_GENERATE_DICTIONARY(forwardDict forward.C LINKDEF linkdef.h)
1917
ROOTTEST_GENERATE_DICTIONARY(constructorDict constructor.hh LINKDEF linkdef.h)

python/stl/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,3 @@ if(ROOT_python_FOUND)
55
PRECMD ${ROOT_root_CMD} -b -q -l -e .L\ StlTypes.C+
66
ENVIRONMENT EXP_PYROOT=${exp_pyroot})
77
endif()
8-

root/meta/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,8 @@ configure_file(templateAutoload.rootmap . COPYONLY)
4242
configure_file(typelist.v5.txt . COPYONLY)
4343
configure_file(typelist.v6.txt . COPYONLY)
4444

45-
# FIXME: Temporary workaround for runtime_cxxmodules;
46-
if(NOT ROOT_runtime_cxxmodules_FOUND)
4745
ROOTTEST_ADD_AUTOMACROS(DEPENDS ANSTmpltInt.C TmpltInt0.C TmpltInt1.C TmpltFloat.C
4846
TmpltNoSpec.C Event.cxx ${COMPILE_MACRO_TEST})
49-
endif()
5047

5148

5249
ROOTTEST_ADD_TEST(drawing

root/tree/CMakeLists.txt

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,2 @@
1-
if(ROOT_runtime_cxxmodules_FOUND)
2-
set(excluded_rtcxxmod_tests friend fastcloningeventtree)
3-
ROOTTEST_ADD_TESTDIRS(EXCLUDED_DIRS ${excluded_rtcxxmod_tests})
4-
else()
5-
set(excluded_tests fastcloningeventtree)
6-
ROOTTEST_ADD_TESTDIRS(EXCLUDED_DIRS ${excluded_tests})
7-
endif()
1+
set(excluded_tests fastcloningeventtree)
2+
ROOTTEST_ADD_TESTDIRS(EXCLUDED_DIRS ${excluded_tests})

root/tree/addresses/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
# define a CTest test that calls 'make' in ${CMAKE_CURRENT_SOURCE_DIR}
55
#
66
#-------------------------------------------------------------------------------
7-
ROOTTEST_ADD_OLDTEST(LABELS longtest)
87

8+
ROOTTEST_ADD_OLDTEST(LABELS longtest)

root/treeformula/parse/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
# define a CTest test that calls 'make' in ${CMAKE_CURRENT_SOURCE_DIR}
55
#
66
#-------------------------------------------------------------------------------
7-
ROOTTEST_ADD_OLDTEST(LABELS longtest)
87

8+
ROOTTEST_ADD_OLDTEST(LABELS longtest)

root/treeformula/sync/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,4 @@
44
# define a CTest test that calls 'make' in ${CMAKE_CURRENT_SOURCE_DIR}
55
#
66
#-------------------------------------------------------------------------------
7-
if(NOT ROOT_runtime_cxxmodules_FOUND)
8-
ROOTTEST_ADD_OLDTEST()
9-
endif()
7+
ROOTTEST_ADD_OLDTEST()

root/treeproxy/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@
44
# define a CTest test that calls 'make' in ${CMAKE_CURRENT_SOURCE_DIR}
55
#
66
#-------------------------------------------------------------------------------
7+
78
ROOTTEST_ADD_OLDTEST(LABELS longtest)

0 commit comments

Comments
 (0)