Skip to content

Commit 6812cd7

Browse files
committed
Revert "[CMake] Never force RUN_SERIAL in roottest when using Ninja"
This reverts commit c8d6ef5, again: The same change was already attempted in commit e8519e4 ("[roottest] Remove sequential compilation with Ninja.") and reverted in bab6bef which also holds some explanations and pointers why Ninja cannot be launched concurrently.
1 parent b71af41 commit 6812cd7

File tree

1 file changed

+13
-0
lines changed

1 file changed

+13
-0
lines changed

cmake/modules/RootMacros.cmake

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2367,6 +2367,9 @@ macro(ROOTTEST_COMPILE_MACRO filename)
23672367
set_property(TEST ${COMPILE_MACRO_TEST} PROPERTY FAIL_REGULAR_EXPRESSION "Warning in")
23682368
endif()
23692369
set_property(TEST ${COMPILE_MACRO_TEST} PROPERTY ENVIRONMENT ${ROOTTEST_ENVIRONMENT})
2370+
if(CMAKE_GENERATOR MATCHES Ninja AND NOT MSVC)
2371+
set_property(TEST ${COMPILE_MACRO_TEST} PROPERTY RUN_SERIAL true)
2372+
endif()
23702373
if (ARG_FIXTURES_SETUP)
23712374
set_property(TEST ${COMPILE_MACRO_TEST} PROPERTY
23722375
FIXTURES_SETUP ${ARG_FIXTURES_SETUP})
@@ -2469,6 +2472,9 @@ macro(ROOTTEST_GENERATE_DICTIONARY dictname)
24692472
-- ${always-make})
24702473
24712474
set_property(TEST ${GENERATE_DICTIONARY_TEST} PROPERTY ENVIRONMENT ${ROOTTEST_ENVIRONMENT})
2475+
if(CMAKE_GENERATOR MATCHES Ninja AND NOT MSVC)
2476+
set_property(TEST ${GENERATE_DICTIONARY_TEST} PROPERTY RUN_SERIAL true)
2477+
endif()
24722478
24732479
if (ARG_FIXTURES_SETUP)
24742480
set_property(TEST ${GENERATE_DICTIONARY_TEST} PROPERTY
@@ -2582,6 +2588,9 @@ macro(ROOTTEST_GENERATE_REFLEX_DICTIONARY dictionary)
25822588
-- ${always-make})
25832589
25842590
set_property(TEST ${GENERATE_REFLEX_TEST} PROPERTY ENVIRONMENT ${ROOTTEST_ENVIRONMENT})
2591+
if(CMAKE_GENERATOR MATCHES Ninja AND NOT MSVC)
2592+
set_property(TEST ${GENERATE_REFLEX_TEST} PROPERTY RUN_SERIAL true)
2593+
endif()
25852594
25862595
if (ARG_FIXTURES_SETUP)
25872596
set_property(TEST ${GENERATE_REFLEX_TEST} PROPERTY
@@ -2702,6 +2711,10 @@ macro(ROOTTEST_GENERATE_EXECUTABLE executable)
27022711
RESOURCE_LOCK ${ARG_RESOURCE_LOCK})
27032712
endif()
27042713
2714+
if(CMAKE_GENERATOR MATCHES Ninja AND NOT MSVC)
2715+
set_property(TEST ${GENERATE_EXECUTABLE_TEST} PROPERTY RUN_SERIAL true)
2716+
endif()
2717+
27052718
if(MSVC AND NOT CMAKE_GENERATOR MATCHES Ninja)
27062719
add_custom_command(TARGET ${executable} POST_BUILD
27072720
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/${executable}.exe

0 commit comments

Comments
 (0)