Skip to content

Commit 392d6bc

Browse files
committed
Use GNUInstallDirs to install into /usr/lib64 as needed
1 parent d6f05b8 commit 392d6bc

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

CMakeLists.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ set(BUILDNAME "${osname}-${osrel}-${cpu}" CACHE STRING "Build name variab
3333
ENDIF()
3434
ENABLE_TESTING()
3535
INCLUDE(CTest)
36+
# For CMAKE_INSTALL_LIBDIR
37+
INCLUDE(GNUInstallDirs)
3638

3739
IF(MSVC)
3840
SET(GLOBAL PROPERTY USE_FOLDERS ON)
@@ -237,16 +239,16 @@ IF(NOT MSVC)
237239
# (but later on when installing)
238240
SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
239241

240-
SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
242+
SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
241243

242244
# add the automatically determined parts of the RPATH
243245
# which point to directories outside the build tree to the install RPATH
244246
SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
245247

246248
# the RPATH to be used when installing, but only if it's not a system directory
247-
LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir)
249+
LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}" isSystemDir)
248250
IF("${isSystemDir}" STREQUAL "-1")
249-
SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
251+
SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
250252
ENDIF("${isSystemDir}" STREQUAL "-1")
251253
ENDIF()
252254

liblib/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,12 @@ SET_TARGET_PROPERTIES(netcdf PROPERTIES
8383
SOVERSION ${netCDF_SO_VERSION})
8484

8585
INSTALL(TARGETS netcdf EXPORT netcdf-targets RUNTIME DESTINATION bin COMPONENT libraries
86-
LIBRARY DESTINATION lib COMPONENT libraries
87-
ARCHIVE DESTINATION lib COMPONENT libraries
86+
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries
87+
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries
8888
)
8989

9090
SET(ALL_TLL_LIBS ${TLL_LIBS} PARENT_SCOPE)
9191

9292
FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.h ${CMAKE_CURRENT_SOURCE_DIR}/*.c)
9393
SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am)
94-
ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
94+
ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")

0 commit comments

Comments
 (0)