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 367901f0b6f694cb65fd9f9209b4af1402f34cdc..d9020e8a12c3a90b4eaf96abc933584d40b2948a 100644 (file)
--- a/deal.II/doc/news/changes.h
+++ b/deal.II/doc/news/changes.h
@@ -97,6 +97,11 @@ inconvenience this causes.
 
 
 <ol>
+  <li> Ported: The build system now supports cmake-3.0.0
+  <br>
+  (Matthias Maier, 2014/07/15)
+  </li>
+
   <li> New: Added support for curved interior boundaries, and general
   manifold id description.
   <br>

diff --git a/deal.II/tests/CMakeLists.txt b/deal.II/tests/CMakeLists.txt
index 0f5a62e17f57d40e79cadd4d9f300af30a4aca9a..764d688f011b4d68c5af338bf7637656a2ba61e0 100644 (file)
--- 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 1c7a815469776f43571461137dbe16961403e14b..91fe4c552a08a01f2b8dae87ec054256e7d404d1 100644 (file)
--- 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"