]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Bugfix
authorMatthias Maier <tamiko@kyomu.43-1.org>
Mon, 16 Sep 2013 00:29:28 +0000 (00:29 +0000)
committerMatthias Maier <tamiko@kyomu.43-1.org>
Mon, 16 Sep 2013 00:29:28 +0000 (00:29 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30722 0785d39b-7218-0410-832d-ea1e28bc413d

tests/CMakeLists.txt

index b41f9899c9e69d1cfab07f68a9be4849c9781c8a..c8f8e3da5a6d61c96a26b17e7609020d38e06d24 100644 (file)
@@ -64,14 +64,11 @@ FOREACH(_category ${_categories})
   # avoid stale test definitions:
   FILE(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/${_category}/CTestTestfile.cmake)
 
-  ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/${_category}
-    COMMAND ${CMAKE_COMMAND} -E make_directory
-      ${CMAKE_CURRENT_BINARY_DIR}/${_category}
-    )
   ADD_CUSTOM_TARGET(setup_test_${_category}
     COMMAND ${CMAKE_COMMAND} -E make_directory
       ${CMAKE_CURRENT_BINARY_DIR}/${_category}
-    COMMAND ${CMAKE_COMMAND}
+    COMMAND cd ${CMAKE_CURRENT_BINARY_DIR}/${_category} &&
+      ${CMAKE_COMMAND}
       -G${CMAKE_GENERATOR}
       -DDEAL_II_DIR=${CMAKE_BINARY_DIR}
       -DDEAL_II_SOURCE_DIR=${CMAKE_SOURCE_DIR}
@@ -81,7 +78,6 @@ FOREACH(_category ${_categories})
       -DTEST_TIME_LIMIT=${TEST_TIME_LIMIT} # TODO: Refactor
       ${CMAKE_CURRENT_SOURCE_DIR}/${_category}
       > /dev/null # Shoo!
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_category}
     DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_category}
     COMMENT "Processing ./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.