@@ -79,8 +79,6 @@ endif ()
7979
8080macro (SCALAPACK_install_library lib)
8181 install (TARGETS ${lib} EXPORT scalapack-targets
82- ARCHIVE DESTINATION lib${LIB_SUFFIX}
83- LIBRARY DESTINATION lib${LIB_SUFFIX}
8482 RUNTIME DESTINATION Testing
8583 )
8684endmacro ()
@@ -120,9 +118,8 @@ endif ()
120118include ( CheckBLACSCompilerFlags )
121119CheckBLACSCompilerFlags()
122120
123- set (prefix ${CMAKE_INSTALL_PREFIX} )
124- set (libdir ${CMAKE_INSTALL_PREFIX} /lib${LIB_SUFFIX} )
125- set (PKG_CONFIG_DIR ${libdir} /pkgconfig)
121+ include (GNUInstallDirs)
122+ set (PKG_CONFIG_DIR ${CMAKE_INSTALL_LIBDIR} /pkgconfig CACHE PATH "pkg-config install path" )
126123
127124# --------------------------------------------------
128125# BLACS Internal variables
@@ -307,7 +304,7 @@ export(TARGETS scalapack FILE scalapack-targets.cmake)
307304if ( NOT LAPACK_FOUND )
308305 install (FILES
309306 ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES}
310- DESTINATION lib
307+ DESTINATION ${CMAKE_INSTALL_LIBDIR}
311308 )
312309endif ( NOT LAPACK_FOUND )
313310
@@ -327,8 +324,8 @@ configure_file(${SCALAPACK_SOURCE_DIR}/CMAKE/scalapack-config-install.cmake.in
327324install (FILES
328325 ${SCALAPACK_BINARY_DIR} /CMakeFiles/scalapack-config.cmake
329326 ${SCALAPACK_BINARY_DIR} /scalapack-config-version .cmake
330- DESTINATION lib /cmake/scalapack-${SCALAPACK_VERSION}
327+ DESTINATION ${CMAKE_INSTALL_LIBDIR} /cmake/scalapack-${SCALAPACK_VERSION}
331328 )
332329
333330install (EXPORT scalapack-targets
334- DESTINATION lib /cmake/scalapack-${SCALAPACK_VERSION} )
331+ DESTINATION ${CMAKE_INSTALL_LIBDIR} /cmake/scalapack-${SCALAPACK_VERSION} )
0 commit comments