Skip to content

Commit 8ee80ef

Browse files
committed
Remove all workarounds wrt cxxmodules.
1 parent 12ae770 commit 8ee80ef

File tree

7 files changed

+4
-12
lines changed

7 files changed

+4
-12
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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,3 @@ if(ROOT_python_FOUND)
44
COPY_TO_BUILDDIR StlTypes.C
55
PRECMD ${ROOT_root_CMD} -b -q -l -e .L\ StlTypes.C+)
66
endif()
7-

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 & 6 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)
@@ -45,11 +42,8 @@ configure_file(templateAutoload.rootmap . COPYONLY)
4542
configure_file(typelist.v5.txt . COPYONLY)
4643
configure_file(typelist.v6.txt . COPYONLY)
4744

48-
# FIXME: Temporary workaround for runtime_cxxmodules;
49-
if(NOT ROOT_runtime_cxxmodules_FOUND)
5045
ROOTTEST_ADD_AUTOMACROS(DEPENDS ANSTmpltInt.C TmpltInt0.C TmpltInt1.C TmpltFloat.C
5146
TmpltNoSpec.C Event.cxx ${COMPILE_MACRO_TEST})
52-
endif()
5347

5448

5549
ROOTTEST_ADD_TEST(drawing

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/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)