]> https://gitweb.dealii.org/ - dealii.git/commitdiff
don't use ninja for testsuite 2767/head
authorTimo Heister <timo.heister@gmail.com>
Thu, 7 Jul 2016 15:02:14 +0000 (16:02 +0100)
committerTimo Heister <timo.heister@gmail.com>
Thu, 7 Jul 2016 15:02:14 +0000 (16:02 +0100)
Do not pass the generator to the testsuite so that we use make instead
of ninja for the test projects. This is because calling ninja several
times in parallel for the same project will break the configuration.

This shouldn't have a performance penalty because the individual targets
are relatively simple and don't depend on more than one file.

tests/CMakeLists.txt

index f444fe3e2f2d2c4e20b352e54257f078c6311fc6..7e2625b7c12ab7873dc9e054e2e1e4667b32bc3b 100644 (file)
@@ -115,7 +115,10 @@ FOREACH(_category ${_categories})
   IF(DEAL_II_MSVC)
     SET(_command ${CMAKE_COMMAND} -G${CMAKE_GENERATOR} ${_options} ${_category_dir})
   ELSE()
-    SET(_command ${CMAKE_COMMAND} -G${CMAKE_GENERATOR} ${_options} ${_category_dir} > /dev/null)
+    # Do not pass the generator with -G so that we use make instead of ninja
+    # for the test projects. This is because calling ninja several times in
+    # parallel for the same project will break the configuration.
+    SET(_command ${CMAKE_COMMAND} ${_options} ${_category_dir} > /dev/null)
   ENDIF()
 
   ADD_CUSTOM_TARGET(setup_tests_${_category}

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.