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 /LAPACKE | |
| parent | 10032da156bd79af24c44aa6c6f0cf8b0f136d06 (diff) | |
| parent | b7486d8bb9d795b659480c94cd2bda945af4c80a (diff) | |
Merge branch 'FixInstalledPathingWithLib64' of https://github.com/hjmjohnson/lapack into hjmjohnson-FixInstalledPathingWithLib64
Diffstat (limited to 'LAPACKE')
| -rw-r--r-- | LAPACKE/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | LAPACKE/cmake/lapacke-config-install.cmake.in | 4 |
2 files changed, 3 insertions, 3 deletions
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. |