Skip to content

Commit 2e64a7a

Browse files
committed
[Installation] On CentOS install to /usr/lib64
1 parent 004126b commit 2e64a7a

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

CMakeLists.txt

+6-2
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ if(KS_PLAT_LIN)
3434
find_package(Git)
3535
find_program(GZIP_CMD gzip)
3636
find_program(DATE_CMD date)
37+
include(GNUInstallDirs)
3738
endif()
3839

3940
# Fixes build on older gcc, Debian Jessie
@@ -79,6 +80,9 @@ endif()
7980
if("${CMAKE_OS_NAME}" STREQUAL "Centos")
8081

8182
# Enable component install
83+
# Install shared libraries to /usr/lib64
84+
set(CMAKE_INSTALL_LIBDIR lib64 CACHE PATH "Library installation location" FORCE)
85+
set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
8286
set(CPACK_RPM_COMPONENT_INSTALL ON)
8387

8488
# Find stuff we need for packaging on Centos
@@ -306,7 +310,7 @@ include(CPack)
306310
# us to run the apps from the build dir without installing (come install time
307311
# the binary is re-linked with an rpath matching that of the install prefix)
308312
set(SKIP_BUILD_RPATH TRUE)
309-
set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
313+
set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
310314

311315
# Use the link path for the rpath
312316
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
@@ -390,7 +394,7 @@ set(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}" "${PROJECT_BINARY_DIR}")
390394

391395
if (NOT KS_PLAT_WIN)
392396
# Set install targets
393-
install(TARGETS signalwire_client COMPONENT "runtime" EXPORT SignalWireClientConfig DESTINATION lib)
397+
install(TARGETS signalwire_client COMPONENT "runtime" EXPORT SignalWireClientConfig DESTINATION ${CMAKE_INSTALL_LIBDIR})
394398
install(DIRECTORY inc/signalwire-client-c COMPONENT "runtime" DESTINATION include PATTERN internal EXCLUDE)
395399

396400
# Set path for pkg-config based on ARCH and distro type

signalwire_client.pc.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
prefix=@PC_PREFIX@
22
exec_prefix=${prefix}
3-
libdir=${prefix}/lib
3+
libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
44
includedir=${prefix}/include
55
definitions=@PC_DEFINITIONS@
66

0 commit comments

Comments
 (0)