@@ -16,6 +16,8 @@ if(BUILD_COMPLEX16)
1616 set (BUILD_DOUBLE true )
1717endif ()
1818
19+ include (GNUInstallDirs)
20+
1921# Configure the warning and code coverage suppression file
2022configure_file (
2123 "${SCALAPACK_SOURCE_DIR} /CMAKE/CTestCustom.cmake.in"
@@ -179,8 +181,8 @@ else(LAPACK_FOUND)
179181 ENDIF (USE_OPTIMIZED_LAPACK_BLAS)
180182 if (NOT LAPACK_FOUND)
181183 message (STATUS "--> LAPACK and BLAS were not found. Reference LAPACK and BLAS will be downloaded and installed" )
182- SET (LAPACK_LIBRARIES ${SCALAPACK_BINARY_DIR} /lib /liblapack${CMAKE_STATIC_LIBRARY_SUFFIX} CACHE STRING "LAPACK library" FORCE)
183- SET (BLAS_LIBRARIES ${SCALAPACK_BINARY_DIR} /lib /libblas${CMAKE_STATIC_LIBRARY_SUFFIX} CACHE STRING "BLAS library" FORCE)
184+ SET (LAPACK_LIBRARIES ${SCALAPACK_BINARY_DIR} /${CMAKE_INSTALL_LIBDIR} /liblapack${CMAKE_STATIC_LIBRARY_SUFFIX} CACHE STRING "LAPACK library" FORCE)
185+ SET (BLAS_LIBRARIES ${SCALAPACK_BINARY_DIR} /${CMAKE_INSTALL_LIBDIR} /libblas${CMAKE_STATIC_LIBRARY_SUFFIX} CACHE STRING "BLAS library" FORCE)
184186
185187 include (ExternalProject)
186188 ExternalProject_Add(
@@ -196,6 +198,10 @@ else(LAPACK_FOUND)
196198 TLS_VERIFY true
197199 BUILD_BYPRODUCTS ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES}
198200 )
201+
202+ install (FILES ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES}
203+ DESTINATION ${CMAKE_INSTALL_LIBDIR}
204+ )
199205 ENDIF ()
200206ENDIF ()
201207
@@ -324,13 +330,6 @@ INCLUDE(CPack)
324330
325331export (TARGETS scalapack FILE scalapack-targets.cmake)
326332
327- if ( NOT LAPACK_FOUND )
328- install (FILES
329- ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES}
330- DESTINATION lib
331- )
332- endif ( NOT LAPACK_FOUND )
333-
334333configure_file (${SCALAPACK_SOURCE_DIR} /CMAKE/scalapack-config-version .cmake.in
335334 ${SCALAPACK_BINARY_DIR} /scalapack-config-version .cmake @ONLY)
336335configure_file (${SCALAPACK_SOURCE_DIR} /CMAKE/scalapack-config-build .cmake.in
@@ -347,11 +346,11 @@ configure_file(${SCALAPACK_SOURCE_DIR}/CMAKE/scalapack-config-install.cmake.in
347346install (FILES
348347 ${SCALAPACK_BINARY_DIR} /CMakeFiles/scalapack-config.cmake
349348 ${SCALAPACK_BINARY_DIR} /scalapack-config-version .cmake
350- DESTINATION lib /cmake/scalapack-${SCALAPACK_VERSION}
349+ DESTINATION ${CMAKE_INSTALL_LIBDIR} /cmake/scalapack-${SCALAPACK_VERSION}
351350 )
352351
353352install (EXPORT scalapack-targets
354- DESTINATION lib /cmake/scalapack-${SCALAPACK_VERSION} )
353+ DESTINATION ${CMAKE_INSTALL_LIBDIR} /cmake/scalapack-${SCALAPACK_VERSION} )
355354
356355
357356include (FeatureSummary)
0 commit comments