From: maier Date: Fri, 21 Sep 2012 12:11:08 +0000 (+0000) Subject: Actually working... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=99cd79ed21ee77526c26e0b1fff9a2457d071465;p=dealii-svn.git Actually working... git-svn-id: https://svn.dealii.org/branches/branch_cmake@26593 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/CMakeLists.txt b/deal.II/CMakeLists.txt index 7e472f695c..7884a1291e 100644 --- a/deal.II/CMakeLists.txt +++ b/deal.II/CMakeLists.txt @@ -377,11 +377,24 @@ ADD_SUBDIRECTORY(source) # -# Prepare some directories for installation: +# Set DEAL_II_LIBRARIES and DEAL_II_INCLUDE_DIRS at this point... # -ADD_SUBDIRECTORY(contrib/config) # has to be included after source +GET_TARGET_PROPERTY(deal_II_NAME deal_II LOCATION) +GET_FILENAME_COMPONENT(deal_II_NAME ${deal_II_NAME} NAME) +LIST(APPEND DEAL_II_LIBRARIES + "${CMAKE_INSTALL_PREFIX}/${DEAL_II_LIBRARY_RELDIR}/${deal_II_NAME}" + ) +LIST(APPEND DEAL_II_INCLUDE_DIRS + "${CMAKE_INSTALL_PREFIX}/${DEAL_II_INCLUDE_RELDIR}" + ) + + +# +# Prepare some directories for installation (include them after +# DEAL_II_LIBRARIES and DEAL_II_INCLUDE_DIRS is set) +# +ADD_SUBDIRECTORY(contrib/config) ADD_SUBDIRECTORY(doc) ADD_SUBDIRECTORY(examples) ADD_SUBDIRECTORY(scripts) - diff --git a/deal.II/contrib/cmake/setup_finalize.cmake b/deal.II/contrib/cmake/setup_finalize.cmake index 14cc190006..b0bbade036 100644 --- a/deal.II/contrib/cmake/setup_finalize.cmake +++ b/deal.II/contrib/cmake/setup_finalize.cmake @@ -2,6 +2,7 @@ # Finalize the configuration: # + # # Append the saved initial (cached) variables ${flags}_SAVED at the end of # ${flags}, see setup_cached_compiler_flags.cmake and the main diff --git a/deal.II/contrib/config/deal.IIConfig.cmake.in b/deal.II/contrib/config/deal.IIConfig.cmake.in index f7330f24c2..66a1bd5d93 100644 --- a/deal.II/contrib/config/deal.IIConfig.cmake.in +++ b/deal.II/contrib/config/deal.IIConfig.cmake.in @@ -50,7 +50,7 @@ SET(DEAL_II_AR "${CMAKE_AR}") # -# Information on how to find and use the deal.II installation +# Information on where to find the deal.II library and headers # SET(DEAL_II_INCLUDE_DIRS "${DEAL_II_INCLUDE_DIRS}") diff --git a/deal.II/source/CMakeLists.txt b/deal.II/source/CMakeLists.txt index 06b4fc5887..90a8ebc274 100644 --- a/deal.II/source/CMakeLists.txt +++ b/deal.II/source/CMakeLists.txt @@ -65,21 +65,3 @@ INSTALL(TARGETS deal_II COMPONENT library ) - -IF(DEAL_II_INSTALL_COMPAT_FILES) - # - # If ${LIB_SUFFIX} is not empty, create a symlink from lib to - # lib${LIB_SUFFIX} to ensure compatibility with the old build system: - # - IF(NOT "${LIB_SUFFIX}" STREQUAL "") - INSTALL( - CODE - "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink - ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} - ${CMAKE_INSTALL_PREFIX}/lib - )" - COMPONENT compat_files - ) - ENDIF() -ENDIF() -