From: maier Date: Sun, 8 Dec 2013 17:14:12 +0000 (+0000) Subject: Revert the last two commits because RULE_LAUNCH_COMPILE is not supported by X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=933a098b98a9f64c34c8701a9a9cd21f035bcf29;p=dealii-svn.git Revert the last two commits because RULE_LAUNCH_COMPILE is not supported by the Ninja Generator... git-svn-id: https://svn.dealii.org/trunk@31948 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/tests/quick_tests/CMakeLists.txt b/deal.II/tests/quick_tests/CMakeLists.txt index a806d48c97..232036aae0 100644 --- a/deal.II/tests/quick_tests/CMakeLists.txt +++ b/deal.II/tests/quick_tests/CMakeLists.txt @@ -30,37 +30,33 @@ MACRO(make_quicktest test_basename build_name mpi_run) STRING(TOLOWER ${build_name} _build_lowercase) SET(_target ${test_basename}.${_build_lowercase}) LIST(APPEND ALL_TESTS "${_target}") - ADD_EXECUTABLE(${_target} EXCLUDE_FROM_ALL ${test_basename}.cc) DEAL_II_INSOURCE_SETUP_TARGET(${_target} ${build_name}) - # Remove ${_target}-OK prior to compilation: - SET_PROPERTY(TARGET ${_target} PROPERTY RULE_LAUNCH_COMPILE - "rm -f ${CMAKE_CURRENT_BINARY_DIR}/${_target}-OK &&" - ) - IF("${mpi_run}" STREQUAL "") SET(_command ./${_target}) ELSE() SET(_command mpirun -n ${mpi_run} ./${_target}) ENDIF() - - ADD_CUSTOM_COMMAND( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_target}-OK + ADD_CUSTOM_TARGET(${_target}.run + DEPENDS ${_target} COMMAND ${_command} > ${_target}-OK 2>&1 ||(echo "${_target}: RUN failed. Output:" && cat ${_target}-OK && rm ${_target}-OK && exit 1) - DEPENDS ${_target} + COMMAND echo "${_target}: PASSED." WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) - ADD_CUSTOM_TARGET(${_target}.run - COMMAND echo "${_target}: PASSED." - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_target}-OK + # this is a hack to make sure the -OK file is deleted + # even if compilation fails. + ADD_CUSTOM_TARGET(kill-${_target}-OK + COMMAND rm -f ${_target}-OK + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) + ADD_DEPENDENCIES(${_target} kill-${_target}-OK) ADD_TEST(NAME ${_target} COMMAND ${CMAKE_COMMAND} -DTRGT=${_target}.run -DTEST=${_target}