From: Matthias Maier Date: Mon, 16 Sep 2013 09:46:41 +0000 (+0000) Subject: Bugfix X-Git-Tag: v8.1.0~570^2~326 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eeda60d48a95cb23621029471731971bb28c2baa;p=dealii.git Bugfix git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30727 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/tests/cmake/macros/macro_add_test.cmake b/tests/cmake/macros/macro_add_test.cmake index 08588b7db2..9c881f7aca 100644 --- a/tests/cmake/macros/macro_add_test.cmake +++ b/tests/cmake/macros/macro_add_test.cmake @@ -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() # diff --git a/tests/cmake/setup_testsuite.cmake b/tests/cmake/setup_testsuite.cmake index 34d3d8587b..98c23e2a68 100644 --- a/tests/cmake/setup_testsuite.cmake +++ b/tests/cmake/setup_testsuite.cmake @@ -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)