aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sci-libs/trilinos/files/trilinos-11.14.1-fix-install-paths.patch')
-rw-r--r--sci-libs/trilinos/files/trilinos-11.14.1-fix-install-paths.patch61
1 files changed, 0 insertions, 61 deletions
diff --git a/sci-libs/trilinos/files/trilinos-11.14.1-fix-install-paths.patch b/sci-libs/trilinos/files/trilinos-11.14.1-fix-install-paths.patch
deleted file mode 100644
index 32f25f326..000000000
--- a/sci-libs/trilinos/files/trilinos-11.14.1-fix-install-paths.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/cmake/tribits/package_arch/TribitsWriteClientExportFiles.cmake b/cmake/tribits/package_arch/TribitsWriteClientExportFiles.cmake
-index e1c633f..864488f 100644
---- a/cmake/tribits/core/package_arch/TribitsWriteClientExportFiles.cmake
-+++ b/cmake/tribits/core/package_arch/TribitsWriteClientExportFiles.cmake
-@@ -494,8 +494,8 @@ INCLUDE(\"${PROJECT_BINARY_DIR}/${PACKAGE_NAME}Targets.cmake\")"
- FOREACH(PATH ${PATH_LIST})
- SET(RELATIVE_PATH "${RELATIVE_PATH}/..")
- ENDFOREACH()
-- SET(FULL_LIBRARY_DIRS_SET "\${CMAKE_CURRENT_LIST_DIR}/${RELATIVE_PATH}/${${PROJECT_NAME}_INSTALL_LIB_DIR}")
-- SET(FULL_INCLUDE_DIRS_SET "\${CMAKE_CURRENT_LIST_DIR}/${RELATIVE_PATH}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}")
-+ SET(FULL_LIBRARY_DIRS_SET "${${PROJECT_NAME}_INSTALL_LIB_DIR}")
-+ SET(FULL_INCLUDE_DIRS_SET "${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}")
-
- # Custom code in configuration file.
- SET(PACKAGE_CONFIG_CODE "")
-@@ -574,14 +574,14 @@ FUNCTION(TRIBITS_WRITE_PROJECT_CLIENT_EXPORT_FILES_INSTALL_TARGETS PACKAGE_NAME)
- IF (${PROJECT_NAME}_ENABLE_INSTALL_CMAKE_CONFIG_FILES)
- 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
- )
-
- IF(${PACKAGE_NAME}_HAS_NATIVE_LIBRARIES)
- INSTALL(
- EXPORT ${PACKAGE_NAME}
-- DESTINATION "${${PROJECT_NAME}_INSTALL_LIB_DIR}/cmake/${PACKAGE_NAME}"
-+ DESTINATION "${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PACKAGE_NAME}"
- FILE ${PACKAGE_NAME}Targets.cmake
- )
- ENDIF()
-@@ -819,8 +819,8 @@ include(\"${${TRIBITS_PACKAGE}_BINARY_DIR}/${TRIBITS_PACKAGE}Config.cmake\")")
- FOREACH(PATH ${PATH_LIST})
- SET(RELATIVE_PATH "${RELATIVE_PATH}/..")
- ENDFOREACH()
-- SET(${PROJECT_NAME}_CONFIG_INCLUDE_DIRS "\${CMAKE_CURRENT_LIST_DIR}/${RELATIVE_PATH}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}")
-- SET(${PROJECT_NAME}_CONFIG_LIBRARY_DIRS "\${CMAKE_CURRENT_LIST_DIR}/${RELATIVE_PATH}/${${PROJECT_NAME}_INSTALL_LIB_DIR}")
-+ SET(${PROJECT_NAME}_CONFIG_INCLUDE_DIRS "${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}")
-+ SET(${PROJECT_NAME}_CONFIG_LIBRARY_DIRS "${${PROJECT_NAME}_INSTALL_LIB_DIR}")
-
- # Write the specification of the rpath if necessary. This is only needed if we're building shared libraries.
- IF(BUILD_SHARED_LIBS)
-@@ -845,7 +845,7 @@ include(\"\${CMAKE_CURRENT_LIST_DIR}/../${TRIBITS_PACKAGE}/${TRIBITS_PACKAGE}Con
-
- 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
- )
- ENDIF()
-@@ -890,7 +890,7 @@ include(\"\${CMAKE_CURRENT_LIST_DIR}/../${TRIBITS_PACKAGE}/${TRIBITS_PACKAGE}Con
- )
- 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()