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 3988fee6965ea72daac32a476a1c31d9923d293a..132a53d4832bf460cd7d8c11b5d35bb974a2714d 100644 (file)
--- 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 9c881f7aca5193d9cce7d6111e1bdaf599ba7102..639bc902887da18b41a86e8a2e11ce2b8891cf08 100644 (file)
--- 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}"