From 3a7bf252cbe99f575217b913c29500a1f5c3e7dd Mon Sep 17 00:00:00 2001 From: maier Date: Fri, 21 Sep 2012 20:24:55 +0000 Subject: [PATCH] Bugfix git-svn-id: https://svn.dealii.org/branches/branch_cmake@26612 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/setup_custom_targets.cmake | 2 +- deal.II/source/CMakeLists.txt | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/deal.II/cmake/setup_custom_targets.cmake b/deal.II/cmake/setup_custom_targets.cmake index 8c48e19911..d4f81e7e8f 100644 --- a/deal.II/cmake/setup_custom_targets.cmake +++ b/deal.II/cmake/setup_custom_targets.cmake @@ -10,7 +10,7 @@ # ADD_CUSTOM_TARGET(library) -ADD_DEPENDENCIES(library deal_II) +ADD_DEPENDENCIES(library ${DEAL_II_BASE_NAME}) IF(DEAL_II_COMPONENT_DOCUMENTATION) diff --git a/deal.II/source/CMakeLists.txt b/deal.II/source/CMakeLists.txt index ae637ee23c..66c8fb3322 100644 --- a/deal.II/source/CMakeLists.txt +++ b/deal.II/source/CMakeLists.txt @@ -23,7 +23,7 @@ ADD_SUBDIRECTORY(numerics) # # Combine all OBJECT targets to a library: # -ADD_LIBRARY(deal_II +ADD_LIBRARY(${DEAL_II_BASE_NAME} $ $ $ @@ -48,17 +48,17 @@ SET_TARGET_PROPERTIES(${DEAL_II_BASE_NAME} PROPERTIES SOVERSION ${VERSION} ) -SET_TARGET_PROPERTIES(deal_II PROPERTIES +SET_TARGET_PROPERTIES(${DEAL_II_BASE_NAME} PROPERTIES LINK_FLAGS "${deal_ii_required_linker_flags}" ) -TARGET_LINK_LIBRARIES(deal_II ${DEAL_II_EXTERNAL_LIBRARIES}) +TARGET_LINK_LIBRARIES(${DEAL_II_BASE_NAME} ${DEAL_II_EXTERNAL_LIBRARIES}) # # Finally, add a rule how to install the library: # -INSTALL(TARGETS deal_II +INSTALL(TARGETS ${DEAL_II_BASE_NAME} LIBRARY DESTINATION ${DEAL_II_LIBRARY_RELDIR} COMPONENT library -- 2.39.5