@@ -79,8 +79,6 @@ endif ()
79
79
80
80
macro (SCALAPACK_install_library lib )
81
81
install (TARGETS ${lib} EXPORT scalapack-targets
82
- ARCHIVE DESTINATION lib${LIB_SUFFIX}
83
- LIBRARY DESTINATION lib${LIB_SUFFIX}
84
82
RUNTIME DESTINATION Testing
85
83
)
86
84
endmacro ()
@@ -120,9 +118,8 @@ endif ()
120
118
include ( CheckBLACSCompilerFlags )
121
119
CheckBLACSCompilerFlags ()
122
120
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" )
126
123
127
124
# --------------------------------------------------
128
125
# BLACS Internal variables
@@ -307,7 +304,7 @@ export(TARGETS scalapack FILE scalapack-targets.cmake)
307
304
if ( NOT LAPACK_FOUND )
308
305
install (FILES
309
306
${BLAS_LIBRARIES} ${LAPACK_LIBRARIES}
310
- DESTINATION lib
307
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}
311
308
)
312
309
endif ( NOT LAPACK_FOUND )
313
310
@@ -327,8 +324,8 @@ configure_file(${SCALAPACK_SOURCE_DIR}/CMAKE/scalapack-config-install.cmake.in
327
324
install (FILES
328
325
${SCALAPACK_BINARY_DIR} /CMakeFiles/scalapack-config.cmake
329
326
${SCALAPACK_BINARY_DIR} /scalapack-config-version.cmake
330
- DESTINATION lib /cmake/scalapack-${SCALAPACK_VERSION}
327
+ DESTINATION ${CMAKE_INSTALL_LIBDIR} /cmake/scalapack-${SCALAPACK_VERSION}
331
328
)
332
329
333
330
install (EXPORT scalapack-targets
334
- DESTINATION lib /cmake/scalapack-${SCALAPACK_VERSION} )
331
+ DESTINATION ${CMAKE_INSTALL_LIBDIR} /cmake/scalapack-${SCALAPACK_VERSION} )
0 commit comments