]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Actually working...
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 21 Sep 2012 12:11:08 +0000 (12:11 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 21 Sep 2012 12:11:08 +0000 (12:11 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26593 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/CMakeLists.txt
deal.II/contrib/cmake/setup_finalize.cmake
deal.II/contrib/config/deal.IIConfig.cmake.in
deal.II/source/CMakeLists.txt

index 7e472f695c91a0817dfc64a9718714156dacd83e..7884a1291e4c64e478e55c40ec068c4ae8e07c05 100644 (file)
@@ -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)
 
-
index 14cc190006c4d1ad4a709e413eb8b7d29d36b2a8..b0bbade036ce5ed223b67fa49c704890da6cdf31 100644 (file)
@@ -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
index f7330f24c2264ed802520b83866740785c3b3afd..66a1bd5d93b75466815d5d8e85d74ac4153eafd8 100644 (file)
@@ -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}")
index 06b4fc58873e74ca164510eae7dd6883a31a8930..90a8ebc274241d46bd34317d480d2f04c27a65ca 100644 (file)
@@ -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()
-

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.