Skip to content

Commit f2dd22e

Browse files
committed
Remove all workarounds wrt cxxmodules.
1 parent 0e1bad3 commit f2dd22e

File tree

7 files changed

+4
-24
lines changed

7 files changed

+4
-24
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)

python/stl/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
# FIXME: Temporary workaround for runtime_cxxmodule
2-
if(NOT ROOT_runtime_cxxmodules_FOUND)
31
if(ROOT_python_FOUND)
42
ROOTTEST_ADD_TEST(stl
53
MACRO PyROOT_stltests.py
64
COPY_TO_BUILDDIR StlTypes.C
75
PRECMD ${ROOT_root_CMD} -b -q -l -e .L\ StlTypes.C+)
86
endif()
9-
endif()

root/io/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1 @@
1-
# FIXME: Temporary workaround for runtime_cxxmodules
2-
if(NOT ROOT_runtime_cxxmodules_FOUND)
31
ROOTTEST_ADD_TESTDIRS()
4-
endif()

root/meta/CMakeLists.txt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
# FIXME: Temporary workaround for runtime_cxxmodules;
2-
if(NOT ROOT_runtime_cxxmodules_FOUND)
31
ROOTTEST_ADD_TEST(getFuncBody
42
MACRO getFuncBody.C)
5-
endif()
63

74
ROOTTEST_ADD_TEST(countIncludePaths
85
MACRO countIncludePaths.C)
@@ -31,15 +28,12 @@ ROOTTEST_ADD_TEST(execpragmasTest
3128
MACRO execpragmasTest.C+
3229
OUTREF execpragmasTest.ref)
3330

34-
# FIXME: Temporary workaround for runtime_cxxmodules
35-
if(NOT ROOT_runtime_cxxmodules_FOUND)
3631
ROOTTEST_GENERATE_EXECUTABLE(loadernotapp loadernotapp.cxx LIBRARIES Core Hist)
3732

3833
ROOTTEST_ADD_TEST(loadernotapp
3934
EXEC ${CMAKE_CURRENT_BINARY_DIR}/loadernotapp
4035
OUTREF loadernotapp.ref
4136
DEPENDS ${GENERATE_EXECUTABLE_TEST})
42-
endif()
4337

4438
ROOTTEST_COMPILE_MACRO(fornamespace.C)
4539

@@ -48,11 +42,8 @@ configure_file(templateAutoload.rootmap . COPYONLY)
4842
configure_file(typelist.v5.txt . COPYONLY)
4943
configure_file(typelist.v6.txt . COPYONLY)
5044

51-
# FIXME: Temporary workaround for runtime_cxxmodules;
52-
if(NOT ROOT_runtime_cxxmodules_FOUND)
5345
ROOTTEST_ADD_AUTOMACROS(DEPENDS ANSTmpltInt.C TmpltInt0.C TmpltInt1.C TmpltFloat.C
5446
TmpltNoSpec.C Event.cxx ${COMPILE_MACRO_TEST})
55-
endif()
5647

5748

5849
ROOTTEST_ADD_TEST(drawing

root/tree/addresses/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,5 @@
44
# define a CTest test that calls 'make' in ${CMAKE_CURRENT_SOURCE_DIR}
55
#
66
#-------------------------------------------------------------------------------
7-
# FIXME: Temporary workaround for runtime_cxxmodule
8-
if(NOT ROOT_runtime_cxxmodules_FOUND)
7+
98
ROOTTEST_ADD_OLDTEST(LABELS longtest)
10-
endif()

root/treeformula/parse/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,5 @@
44
# define a CTest test that calls 'make' in ${CMAKE_CURRENT_SOURCE_DIR}
55
#
66
#-------------------------------------------------------------------------------
7-
# FIXME: Temporary workaround for runtime_cxxmodule
8-
if(NOT ROOT_runtime_cxxmodules_FOUND)
7+
98
ROOTTEST_ADD_OLDTEST(LABELS longtest)
10-
endif()

root/treeproxy/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,5 @@
44
# define a CTest test that calls 'make' in ${CMAKE_CURRENT_SOURCE_DIR}
55
#
66
#-------------------------------------------------------------------------------
7-
# FIXME: Temporary workaround for runtime_cxxmodule
8-
if(NOT ROOT_runtime_cxxmodules_FOUND)
7+
98
ROOTTEST_ADD_OLDTEST(LABELS longtest)
10-
endif()

0 commit comments

Comments
 (0)