From: Matthias Maier Date: Tue, 17 Sep 2013 15:21:12 +0000 (+0000) Subject: Bugfix: Use DEAL_II_USER_DEFINITIONS instead of DEAL_II_DEFINITIONS X-Git-Tag: v8.1.0~570^2~307 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=782dcf14abf8fe473c6ae83db0c466954055e05e;p=dealii.git Bugfix: Use DEAL_II_USER_DEFINITIONS instead of DEAL_II_DEFINITIONS git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30767 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/tests/all-headers/CMakeLists.txt b/tests/all-headers/CMakeLists.txt index 3988fee696..132a53d483 100644 --- a/tests/all-headers/CMakeLists.txt +++ b/tests/all-headers/CMakeLists.txt @@ -69,7 +69,7 @@ FOREACH(_full_file ${_header}) SET_TARGET_PROPERTIES(${_target} PROPERTIES LINK_FLAGS "${DEAL_II_LINKER_FLAGS} ${DEAL_II_LINKER_FLAGS_${_build}}" - COMPILE_DEFINITIONS "${DEAL_II_DEFINITIONS};${DEAL_II_DEFINITIONS_${_build}}" + COMPILE_DEFINITIONS "${DEAL_II_USER_DEFINITIONS};${DEAL_II_USER_DEFINITIONS_${_build}}" COMPILE_FLAGS "${DEAL_II_CXX_FLAGS} ${DEAL_II_CXX_FLAGS_${_build}}" ) SET_PROPERTY(TARGET ${_target} APPEND PROPERTY diff --git a/tests/cmake/macros/macro_add_test.cmake b/tests/cmake/macros/macro_add_test.cmake index 9c881f7aca..639bc90288 100644 --- a/tests/cmake/macros/macro_add_test.cmake +++ b/tests/cmake/macros/macro_add_test.cmake @@ -106,7 +106,7 @@ MACRO(DEAL_II_ADD_TEST _category _test_name _comparison_file _n_cpu) SET_TARGET_PROPERTIES(${_target} PROPERTIES LINK_FLAGS "${DEAL_II_LINKER_FLAGS} ${DEAL_II_LINKER_FLAGS_${_build}}" - COMPILE_DEFINITIONS "${DEAL_II_DEFINITIONS};${DEAL_II_DEFINITIONS_${_build}}" + COMPILE_DEFINITIONS "${DEAL_II_USER_DEFINITIONS};${DEAL_II_USER_DEFINITIONS_${_build}}" COMPILE_FLAGS "${DEAL_II_CXX_FLAGS} ${DEAL_II_CXX_FLAGS_${_build}}" LINKER_LANGUAGE "CXX" RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${_test_short}"