Bugfix: Let setup_tests and tests depend on a compiled library again...

git-svn-id: https://svn.dealii.org/trunk@31600 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/source/CMakeLists.txt b/deal.II/source/CMakeLists.txt
index c221f854c6d38f51b62b73de418443db4cca2012..cabda8f8fd9ac1d054fb83c0eb1ffed3bedf164a 100644 (file)
--- a/deal.II/source/CMakeLists.txt
+++ b/deal.II/source/CMakeLists.txt
@@ -49,6 +49,9 @@ ADD_SUBDIRECTORY(integrators)
 ADD_SUBDIRECTORY(matrix_free)
 ADD_SUBDIRECTORY(meshworker)
 
+# A custom target to build the library:
+ADD_CUSTOM_TARGET(build_library)
+
 FOREACH(build ${DEAL_II_BUILD_TYPES})
   STRING(TOLOWER ${build} build_lowercase)
 
@@ -64,6 +67,7 @@ FOREACH(build ${DEAL_II_BUILD_TYPES})
     ${deal_ii_objects_${build_lowercase}}
     )
 
+  ADD_DEPENDENCIES(build_library ${DEAL_II_BASE_NAME}${DEAL_II_${_build}_SUFFIX})
   ADD_DEPENDENCIES(library ${DEAL_II_BASE_NAME}${DEAL_II_${_build}_SUFFIX})
 
   SET_TARGET_PROPERTIES(${DEAL_II_BASE_NAME}${DEAL_II_${build}_SUFFIX}

diff --git a/deal.II/tests/CMakeLists.txt b/deal.II/tests/CMakeLists.txt
index 23449544a1c402e75dc2a72c66d12805fef904f4..d594c3c3d43d38776922d08938d3221a1728ace6 100644 (file)
--- a/deal.II/tests/CMakeLists.txt
+++ b/deal.II/tests/CMakeLists.txt
@@ -105,8 +105,8 @@ FOREACH(_category ${_categories})
       )
     ADD_DEPENDENCIES(setup_tests setup_tests_${_category})
 
-    # depend on a valid build directory:
-    ADD_DEPENDENCIES(setup_tests_${_category} setup_build_dir)
+    # depend on a compiled library:
+    ADD_DEPENDENCIES(setup_tests_${_category} build_library)
 
     ADD_CUSTOM_TARGET(regen_tests_${_category}
       COMMAND [ ! -d ${_category} ] || ${CMAKE_COMMAND}

diff --git a/deal.II/tests/quick_tests/CMakeLists.txt b/deal.II/tests/quick_tests/CMakeLists.txt
index 2a4031cfab6b2bb329bf10b333c33adf9709d3c0..747e562420db6dd9a9b37490ef19001dc6bb1e56 100644 (file)
--- a/deal.II/tests/quick_tests/CMakeLists.txt
+++ b/deal.II/tests/quick_tests/CMakeLists.txt
@@ -95,5 +95,6 @@ ADD_CUSTOM_TARGET(test
   COMMAND ${CMAKE_CTEST_COMMAND} --force-new-ctest-process
   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
   )
+ADD_DEPENDENCIES(test build_library)
 
 MESSAGE(STATUS "Setup quick_tests in ${_mybuild} mode - Done")