Skip to content

Commit bcfdbbc

Browse files
properly set lib dir for 64 bit systems
1 parent a5c8a01 commit bcfdbbc

File tree

2 files changed

+4
-13
lines changed

2 files changed

+4
-13
lines changed

CMakeLists.txt

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -558,19 +558,9 @@ export(TARGETS ks2
558558
if (NOT KS_PLAT_WIN)
559559

560560
# Set install targets
561-
install(TARGETS ks2 COMPONENT "runtime" EXPORT LibKS2Config DESTINATION lib)
561+
install(TARGETS ks2 COMPONENT "runtime" EXPORT LibKS2Config DESTINATION ${LIB_INSTALL_DIR})
562562
install(DIRECTORY src/include/libks COMPONENT "runtime" DESTINATION include/libks2 PATTERN src/include/libks/internal EXCLUDE)
563-
564-
# Set path for pkg-config based on ARCH and distro type
565-
if("${CMAKE_OS_NAME}" STREQUAL "Centos") # pkg-config --variable pc_path pkg-config
566-
if(${CPACK_SYSTEM_NAME} MATCHES "x86_64")
567-
install(FILES ${PROJECT_BINARY_DIR}/libks2.pc COMPONENT "runtime" DESTINATION lib64/pkgconfig)
568-
else()
569-
install(FILES ${PROJECT_BINARY_DIR}/libks2.pc COMPONENT "runtime" DESTINATION lib/pkgconfig)
570-
endif()
571-
else()
572-
install(FILES ${PROJECT_BINARY_DIR}/libks2.pc COMPONENT "runtime" DESTINATION lib/pkgconfig)
573-
endif()
563+
install(FILES ${PROJECT_BINARY_DIR}/libks2.pc COMPONENT "runtime" DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
574564

575565
install(FILES cmake/ksutil.cmake COMPONENT "runtime" DESTINATION include/libks2/libks/cmake)
576566
install(FILES cmake/FindPCRE.cmake COMPONENT "runtime" DESTINATION include/libks2/libks/cmake)
@@ -599,6 +589,7 @@ if (NOT KS_PLAT_WIN)
599589
# Name: @PACKAGE_NAME@
600590
# Version: @PACKAGE_VERSION@
601591
set(PC_PREFIX ${CMAKE_INSTALL_PREFIX})
592+
set(PC_LIB_DIR ${LIB_INSTALL_DIR})
602593
set(PACKAGE_VERSION ${PROJECT_VERSION})
603594
get_property(PC_DEFINITIONS TARGET ks2 PROPERTY INTERFACE_COMPILE_DEFINITIONS)
604595
configure_file("${CMAKE_CURRENT_LIST_DIR}/libks.pc.in" "${PROJECT_BINARY_DIR}/libks2.pc" @ONLY)

libks.pc.in

Lines changed: 1 addition & 1 deletion
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=@PC_LIB_DIR@
44
includedir=${prefix}/include/libks2
55
definitions=@PC_DEFINITIONS@
66

0 commit comments

Comments
 (0)