diff options
| author | Julien Langou <julien.langou@ucdenver.edu> | 2016-07-11 08:53:53 -0600 |
|---|---|---|
| committer | Julien Langou <julien.langou@ucdenver.edu> | 2016-07-11 08:53:53 -0600 |
| commit | b89dd9375b74f5c5c2477b58032b4d3b22c93f05 (patch) | |
| tree | 9f5ac53ad4e2e160a769831ee67827e168161f95 | |
| parent | 10032da156bd79af24c44aa6c6f0cf8b0f136d06 (diff) | |
| parent | b7486d8bb9d795b659480c94cd2bda945af4c80a (diff) | |
| download | lapack-b89dd9375b74f5c5c2477b58032b4d3b22c93f05.tar.gz lapack-b89dd9375b74f5c5c2477b58032b4d3b22c93f05.tar.bz2 lapack-b89dd9375b74f5c5c2477b58032b4d3b22c93f05.zip | |
Merge branch 'FixInstalledPathingWithLib64' of https://github.com/hjmjohnson/lapack into hjmjohnson-FixInstalledPathingWithLib64
| -rw-r--r-- | CBLAS/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | CBLAS/cmake/cblas-config-install.cmake.in | 4 | ||||
| -rw-r--r-- | LAPACKE/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | LAPACKE/cmake/lapacke-config-install.cmake.in | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/CBLAS/CMakeLists.txt b/CBLAS/CMakeLists.txt index a4a9b8d5..05c3de95 100644 --- a/CBLAS/CMakeLists.txt +++ b/CBLAS/CMakeLists.txt @@ -45,7 +45,7 @@ endif() set(_cblas_config_install_guard_target "") if(ALL_TARGETS) install(EXPORT cblas-targets - DESTINATION lib/cmake/cblas-${LAPACK_VERSION}) + DESTINATION ${LIBRARY_DIR}/cmake/cblas-${LAPACK_VERSION}) # Choose one of the cblas targets to use as a guard for # cblas-config.cmake to load targets from the install tree. list(GET ALL_TARGETS 0 _cblas_config_install_guard_target) @@ -78,9 +78,9 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cblas-config-install.cmake.in install(FILES ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/cblas-config.cmake ${LAPACK_BINARY_DIR}/cblas-config-version.cmake - DESTINATION lib/cmake/cblas-${LAPACK_VERSION} + DESTINATION ${LIBRARY_DIR}/cmake/cblas-${LAPACK_VERSION} ) #install(EXPORT cblas-targets -# DESTINATION lib/cmake/cblas-${LAPACK_VERSION}) +# DESTINATION ${LIBRARY_DIR}/cmake/cblas-${LAPACK_VERSION}) diff --git a/CBLAS/cmake/cblas-config-install.cmake.in b/CBLAS/cmake/cblas-config-install.cmake.in index 3a21ef95..a5e2183e 100644 --- a/CBLAS/cmake/cblas-config-install.cmake.in +++ b/CBLAS/cmake/cblas-config-install.cmake.in @@ -1,11 +1,11 @@ -# Compute locations from <prefix>/lib/cmake/lapacke-<v>/<self>.cmake +# Compute locations from <prefix>/@{LIBRARY_DIR@/cmake/lapacke-<v>/<self>.cmake get_filename_component(_CBLAS_SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) get_filename_component(_CBLAS_PREFIX "${_CBLAS_SELF_DIR}" PATH) get_filename_component(_CBLAS_PREFIX "${_CBLAS_PREFIX}" PATH) get_filename_component(_CBLAS_PREFIX "${_CBLAS_PREFIX}" PATH) # Load the LAPACK package with which we were built. -set(LAPACK_DIR "${_CBLAS_PREFIX}/lib/cmake/lapack-@LAPACK_VERSION@") +set(LAPACK_DIR "${_CBLAS_PREFIX}/@{LIBRARY_DIR@/cmake/lapack-@LAPACK_VERSION@") find_package(LAPACK NO_MODULE) # Load lapacke targets from the install tree. diff --git a/LAPACKE/CMakeLists.txt b/LAPACKE/CMakeLists.txt index 164ae15f..cf708b90 100644 --- a/LAPACKE/CMakeLists.txt +++ b/LAPACKE/CMakeLists.txt @@ -82,4 +82,4 @@ install(FILES ) install(EXPORT lapacke-targets - DESTINATION lib/cmake/lapacke-${LAPACK_VERSION}) + DESTINATION ${LIBRARY_DIR}/cmake/lapacke-${LAPACK_VERSION}) diff --git a/LAPACKE/cmake/lapacke-config-install.cmake.in b/LAPACKE/cmake/lapacke-config-install.cmake.in index 2b6b3f0c..9b2452b8 100644 --- a/LAPACKE/cmake/lapacke-config-install.cmake.in +++ b/LAPACKE/cmake/lapacke-config-install.cmake.in @@ -1,11 +1,11 @@ -# Compute locations from <prefix>/lib/cmake/lapacke-<v>/<self>.cmake +# Compute locations from <prefix>/@{LIBRARY_DIR@/cmake/lapacke-<v>/<self>.cmake get_filename_component(_LAPACKE_SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) get_filename_component(_LAPACKE_PREFIX "${_LAPACKE_SELF_DIR}" PATH) get_filename_component(_LAPACKE_PREFIX "${_LAPACKE_PREFIX}" PATH) get_filename_component(_LAPACKE_PREFIX "${_LAPACKE_PREFIX}" PATH) # Load the LAPACK package with which we were built. -set(LAPACK_DIR "${_LAPACKE_PREFIX}/lib/cmake/lapack-@LAPACK_VERSION@") +set(LAPACK_DIR "${_LAPACKE_PREFIX}/@{LIBRARY_DIR@/cmake/lapack-@LAPACK_VERSION@") find_package(LAPACK NO_MODULE) # Load lapacke targets from the install tree. |