From: Timo Heister Date: Thu, 7 Jul 2016 15:02:14 +0000 (+0100) Subject: don't use ninja for testsuite X-Git-Tag: v8.5.0-rc1~915^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53ae79771352fecf759eee3fde46d238422ac77c;p=dealii.git don't use ninja for testsuite 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. --- diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index f444fe3e2f..7e2625b7c1 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -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}