[patch] files/trilinos-10.12.2-fix-install-paths.patch

trilinos-10.12.2-fix-install-paths.patch (text/plain), 2.97 KB, created by Matthias Maier on 2012-11-12 15:34:35 UTC

--- a/cmake/tribits/package_arch/TribitsGlobalMacros.cmake	2012-11-12 16:04:45.000000000 +0100
+++ b/cmake/tribits/package_arch/TribitsGlobalMacros.cmake	2012-11-12 16:05:00.000000000 +0100
@@ -205,21 +205,6 @@
       "If on, then the properter LINK_SEARCH_START_STATIC will be added to all executables." )
   ENDIF()
   
-  ADVANCED_SET(${PROJECT_NAME}_INSTALL_INCLUDE_DIR "include"
-    CACHE PATH
-    "Location where the headers will be installed.  If given as a relative path, it will be relative to ${CMAKE_INSTALL_PREFIX}.  If given as an absolute path, it will used as such.  Default is 'include'"
-    )
-  
-  ADVANCED_SET(${PROJECT_NAME}_INSTALL_LIB_DIR "lib"
-    CACHE PATH
-    "Location where the libraries will be installed.  If given as a relative path, it will be relative to ${CMAKE_INSTALL_PREFIX}.  If given as an absolute path, it will used as such.  Default is 'lib'"
-    )
-  
-  ADVANCED_SET(${PROJECT_NAME}_INSTALL_RUNTIME_DIR "bin"
-    CACHE PATH
-    "Location where the runtime DLLs will be installed.  If given as a relative path, it will be relative to ${CMAKE_INSTALL_PREFIX}.  If given as an absolute path, it will used as such.  Default is 'bin'"
-    )
-  
   IF(WIN32 AND NOT CYGWIN)
     SET(${PROJECT_NAME}_ENABLE_EXPORT_MAKEFILES_DEFAULT OFF)
   ELSE()
--- a/cmake/tribits/package_arch/TribitsPackageWritePackageConfig.cmake	2012-11-12 14:58:00.000000000 +0100
+++ b/cmake/tribits/package_arch/TribitsPackageWritePackageConfig.cmake	2012-11-12 14:42:47.000000000 +0100
@@ -367,7 +367,7 @@
 
   INSTALL(
     FILES ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${PACKAGE_NAME}Config_install.cmake
-    DESTINATION "${${PROJECT_NAME}_INSTALL_LIB_DIR}/cmake/${PACKAGE_NAME}"
+    DESTINATION "${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PACKAGE_NAME}"
     RENAME ${PACKAGE_NAME}Config.cmake
   )
 
@@ -563,7 +563,7 @@
   IF(HAS_INSTALL_TARGETS)
     INSTALL(
       EXPORT ${PROJECT_NAME}
-      DESTINATION "${${PROJECT_NAME}_INSTALL_LIB_DIR}/cmake/${PROJECT_NAME}"
+      DESTINATION "${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PROJECT_NAME}"
       FILE ${PROJECT_NAME}Targets.cmake
       )
     # Import the targets in applications.
@@ -589,7 +589,7 @@
 
   INSTALL(
     FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config_install.cmake
-    DESTINATION "${${PROJECT_NAME}_INSTALL_LIB_DIR}/cmake/${PROJECT_NAME}"
+    DESTINATION "${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PROJECT_NAME}"
     RENAME ${PROJECT_NAME}Config.cmake
   )
   
@@ -632,7 +632,7 @@
 
   INSTALL(
     FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
-    DESTINATION "${${PROJECT_NAME}_INSTALL_LIB_DIR}/cmake/${PROJECT_NAME}"
+    DESTINATION "${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PROJECT_NAME}"
   )
 
 ENDFUNCTION()
--- a/packages/fei/base/CMakeLists.txt	2012-11-12 14:05:18.000000000 +0100
+++ b/packages/fei/base/CMakeLists.txt	2012-11-12 14:05:18.000000000 +0100
@@ -54,5 +54,5 @@
   )
 
 INSTALL(FILES ${HEADERS} DESTINATION
-   ${CMAKE_INSTALL_PREFIX}/include)
+   ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})