From b95e4754af262c548c84cec51a9b11599e0e6076 Mon Sep 17 00:00:00 2001 From: maier Date: Tue, 6 Nov 2012 13:42:01 +0000 Subject: [PATCH] Simplify target selection in DEAL_II_SETUP_TARGET() git-svn-id: https://svn.dealii.org/branches/branch_cmake@27427 0785d39b-7218-0410-832d-ea1e28bc413d --- .../macros/macro_deal_ii_setup_target.cmake | 21 +++++-------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/deal.II/cmake/macros/macro_deal_ii_setup_target.cmake b/deal.II/cmake/macros/macro_deal_ii_setup_target.cmake index c942fe1a02..21ba75c998 100644 --- a/deal.II/cmake/macros/macro_deal_ii_setup_target.cmake +++ b/deal.II/cmake/macros/macro_deal_ii_setup_target.cmake @@ -45,7 +45,7 @@ MACRO(DEAL_II_SETUP_TARGET _target) GET_DIRECTORY_PROPERTY(_inc_dirs_so_far INCLUDE_DIRECTORIES) SET_TARGET_PROPERTIES(${_target} PROPERTIES INCLUDE_DIRECTORIES - "${_inc_dirs_so_far};${DEAL_II_EXTERNAL_INCLUDE_DIRS};${DEAL_II_INCLUDE_DIRS}" + "${_inc_dirs_so_far};${DEAL_II_INCLUDE_DIRS}" LINK_FLAGS "${DEAL_II_LINKER_FLAGS}" COMPILE_DEFINITIONS @@ -62,25 +62,14 @@ MACRO(DEAL_II_SETUP_TARGET _target) COMPILE_DEFINITIONS_${_build} "${DEAL_II_USER_DEFINITIONS_${_build}}" ) - ENDFOREACH() # - # Link againgst the correct deal.II library target for the current - # CMAKE_BUILD_TYPE: + # Link against the deal.II targets: # - STRING(TOUPPER "${CMAKE_BUILD_TYPE}" _build) - IF(NOT "${DEAL_II_TARGET_${_build}}" STREQUAL "") - TARGET_LINK_LIBRARIES(${_target} - ${DEAL_II_TARGET_${_build}} - ) - ELSE() - MESSAGE(FATAL_ERROR - "\nNo matching deal.II library target for current build type: " - "\"${CMAKE_BUILD_TYPE}\"\n" - "Candidates are (case insensitive): ${DEAL_II_BUILD_TYPES}\n\n" - ) - ENDIF() + TARGET_LINK_LIBRARIES(${_target} + ${DEAL_II_TARGET} + ) ENDMACRO() -- 2.39.5