Skip to content

Commit f8a3a59

Browse files
committed
Adapt libdir for 64bit RPM-based distros
RPM-based distros such as Fedora or Mageia put 64bit libraries in /usr/lib64 while 32bit libraries go to /usr/lib. This is usually taken into account in CMake projects using a LIB_SUFFIX parameter that can be set to "" or "64".
1 parent 7165f6a commit f8a3a59

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

Diff for: CMakeLists.txt

+6-4
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,17 @@ IF(NOT WIN32)
1717
ENDIF(NOT CMAKE_BUILD_TYPE)
1818
ENDIF(NOT WIN32)
1919

20+
SET(LIB_SUFFIX "" CACHE STRING "Optional arch-dependent suffix for the library installation directory")
21+
2022
SET(RUNTIME_INSTALL_DIR bin
2123
CACHE PATH "Install dir for executables and dlls")
22-
SET(ARCHIVE_INSTALL_DIR lib
24+
SET(ARCHIVE_INSTALL_DIR lib${LIB_SUFFIX}
2325
CACHE PATH "Install dir for static libraries")
24-
SET(LIBRARY_INSTALL_DIR lib
26+
SET(LIBRARY_INSTALL_DIR lib${LIB_SUFFIX}
2527
CACHE PATH "Install dir for shared libraries")
2628
SET(INCLUDE_INSTALL_DIR include
2729
CACHE PATH "Install dir for headers")
28-
SET(PACKAGE_INSTALL_DIR lib/cmake
30+
SET(PACKAGE_INSTALL_DIR lib${LIB_SUFFIX}/cmake
2931
CACHE PATH "Install dir for cmake package config files")
3032
MARK_AS_ADVANCED( RUNTIME_INSTALL_DIR ARCHIVE_INSTALL_DIR INCLUDE_INSTALL_DIR PACKAGE_INSTALL_DIR )
3133

@@ -101,7 +103,7 @@ IF(JSONCPP_WITH_PKGCONFIG_SUPPORT)
101103
"pkg-config/jsoncpp.pc"
102104
@ONLY)
103105
INSTALL(FILES "${CMAKE_BINARY_DIR}/pkg-config/jsoncpp.pc"
104-
DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig")
106+
DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig")
105107
ENDIF(JSONCPP_WITH_PKGCONFIG_SUPPORT)
106108

107109
IF(JSONCPP_WITH_CMAKE_PACKAGE)

Diff for: pkg-config/jsoncpp.pc.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
prefix=@CMAKE_INSTALL_PREFIX@
22
exec_prefix=${prefix}
3-
libdir=${exec_prefix}/lib
3+
libdir=${exec_prefix}/@LIBRARY_INSTALL_DIR@
44
includedir=${prefix}/@INCLUDE_INSTALL_DIR@
55

66
Name: jsoncpp

0 commit comments

Comments
 (0)