]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Bugfix
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 16 Sep 2013 09:46:41 +0000 (09:46 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 16 Sep 2013 09:46:41 +0000 (09:46 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30727 0785d39b-7218-0410-832d-ea1e28bc413d

tests/cmake/macros/macro_add_test.cmake
tests/cmake/setup_testsuite.cmake

index 08588b7db2e2c7ae6cec13c30cef57367058964e..9c881f7aca5193d9cce7d6111e1bdaf599ba7102 100644 (file)
@@ -118,7 +118,7 @@ MACRO(DEAL_II_ADD_TEST _category _test_name _comparison_file _n_cpu)
           COMPILE_DEFINITIONS
             SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}"
           )
-        TARGET_LINK_LIBRARIES(${_target} ${DEAL_II_TARGET})
+        TARGET_LINK_LIBRARIES(${_target} ${DEAL_II_TARGET_${_build}})
       ENDIF()
 
       #
index 34d3d8587be5afd4a11484212794c85ee908b5b4..98c23e2a68abebf739a278751a98acc31cbbb3fb 100644 (file)
@@ -36,7 +36,7 @@
 # Load all macros:
 #
 
-FILE(GLOB _macro_files "${CMAKE_CURRENT_LIST_DIR}/macros/*.cmake")
+FILE(GLOB _macro_files ${CMAKE_CURRENT_LIST_DIR}/macros/*.cmake)
 FOREACH(_file ${_macro_files})
   INCLUDE(${_file})
 ENDFOREACH()
@@ -66,6 +66,7 @@ ENDIF()
 FIND_PACKAGE(deal.II 8.1 REQUIRED
   HINTS ${DEAL_II_BINARY_DIR} ${DEAL_II_DIR}
   )
+INCLUDE(${DEAL_II_TARGET_CONFIG})
 
 FIND_PACKAGE(Perl REQUIRED)
 

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.