From: maier Date: Wed, 16 Jul 2014 21:11:20 +0000 (+0000) Subject: CMake: Port to version 3.0.0, part 3. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14a41271de8e4e0bf03e21bff6c7df06e085b03b;p=dealii-svn.git CMake: Port to version 3.0.0, part 3. Quick fix for new lexer rules (tm) git-svn-id: https://svn.dealii.org/trunk@33185 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/doc/news/changes.h b/deal.II/doc/news/changes.h index 367901f0b6..d9020e8a12 100644 --- a/deal.II/doc/news/changes.h +++ b/deal.II/doc/news/changes.h @@ -97,6 +97,11 @@ inconvenience this causes.
    +
  1. Ported: The build system now supports cmake-3.0.0 +
    + (Matthias Maier, 2014/07/15) +
  2. +
  3. New: Added support for curved interior boundaries, and general manifold id description.
    diff --git a/deal.II/tests/CMakeLists.txt b/deal.II/tests/CMakeLists.txt index 0f5a62e17f..764d688f01 100644 --- a/deal.II/tests/CMakeLists.txt +++ b/deal.II/tests/CMakeLists.txt @@ -112,14 +112,16 @@ FOREACH(_category ${_categories}) ADD_DEPENDENCIES(prune_tests prune_tests_${_category}) ADD_CUSTOM_TARGET(regen_tests_${_category} - COMMAND ${CMAKE_COMMAND} + COMMAND + test ! -f ${CMAKE_BINARY_DIR}/tests/${_category} || ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR}/${_category} --target regenerate COMMENT "Processing tests/${_category}" ) ADD_DEPENDENCIES(regen_tests regen_tests_${_category}) ADD_CUSTOM_TARGET(clean_tests_${_category} - COMMAND ${CMAKE_COMMAND} + COMMAND + test ! -f ${CMAKE_BINARY_DIR}/tests/${_category} || ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR}/${_category} --target clean COMMENT "Processing tests/${_category}" ) diff --git a/deal.II/tests/build_tests/CMakeLists.txt b/deal.II/tests/build_tests/CMakeLists.txt index 1c7a815469..91fe4c552a 100644 --- a/deal.II/tests/build_tests/CMakeLists.txt +++ b/deal.II/tests/build_tests/CMakeLists.txt @@ -113,7 +113,7 @@ FOREACH(_step_full ${_steps}) # And a rule on how to build the example step: ADD_CUSTOM_COMMAND(OUTPUT ${_step_dir}/build_output - COMMAND [ ! -f ${_step_dir}/configure_output ] + COMMAND test ! -f ${_step_dir}/configure_output || (rm -f ${_step_dir}/failing_build_output &&${CMAKE_COMMAND} --build ${_step_dir} --target all > ${_step_dir}/build_output 2>&1) @@ -123,7 +123,7 @@ FOREACH(_step_full ${_steps}) && echo "${_test}: BUILD failed. Output:" && cat ${_step_dir}/failing_build_output && exit 1) - COMMAND [ -f ${_step_dir}/configure_output ] + COMMAND test -f ${_step_dir}/configure_output || (rm -f ${_step_dir}/build_output && rm -f ${_step_dir}/failing_build_output && echo "${_test}: BUILD stage not invoked due to failing CONFIGURE") # succeed anyway! @@ -133,7 +133,7 @@ FOREACH(_step_full ${_steps}) # And a rule on how to run the example step: ADD_CUSTOM_COMMAND(OUTPUT ${_step_dir}/run_output - COMMAND [ ! -f ${_step_dir}/build_output ] + COMMAND test ! -f ${_step_dir}/build_output || (rm -f ${_step_dir}/failing_run_output && ${CMAKE_COMMAND} --build ${_step_dir} --target run > ${_step_dir}/run_output 2>&1) @@ -144,7 +144,7 @@ FOREACH(_step_full ${_steps}) && echo "${_test}: RUN failed. Output:" && cat ${_step_dir}/failing_run_output && exit 1) - COMMAND [ -f ${_step_dir}/build_output ] + COMMAND test -f ${_step_dir}/build_output || ( rm -f ${_step_dir}/run_output && rm -f ${_step_dir}/failing_run_output && echo "${_test}: RUN stage not invoked due to failing BUILD"