From 4a1afbc0b0fa6968ea2605e47d00fd68f9ddeff6 Mon Sep 17 00:00:00 2001 From: Gerd von Egidy Date: Wed, 8 Apr 2015 09:58:29 +0200 Subject: [PATCH] write libs into lib64 dir on 64 bit platforms --- CMakeLists.txt | 15 ++++++++++++--- configlib/CMakeLists.txt | 2 +- src/CMakeLists.txt | 2 +- utils/CMakeLists.txt | 2 +- xmllib/CMakeLists.txt | 2 +- 5 files changed, 16 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a77be06..6d094c9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,6 +35,15 @@ set(CPACK_COMPONENT_HEADERS_DESCRIPTION set(CPACK_COMPONENT_SHAREDLIBS_GROUP "Development") set(CPACK_COMPONENT_HEADERS_GROUP "Development") +# Create suffix to eventually install in lib64 +IF(CMAKE_SIZEOF_VOID_P EQUAL 4) + SET(LIB_SUFFIX "") + SET(PACK_ARCH "") + ELSE(CMAKE_SIZEOF_VOID_P EQUAL 4) + SET(LIB_SUFFIX 64) + SET(PACK_ARCH .x86_64) +endif(CMAKE_SIZEOF_VOID_P EQUAL 4) + # Package information set(CPACK_PACKAGE_VERSION ${VERSION}) set(CPACK_PACKAGE_CONTACT "Intra2net AG ") @@ -141,7 +150,7 @@ endif(IMAP_UTF7_SUPPORT) set(prefix ${CMAKE_INSTALL_PREFIX}) set(exec_prefix ${CMAKE_INSTALL_PREFIX}/bin) set(includedir ${CMAKE_INSTALL_PREFIX}/include) -set(libdir ${CMAKE_INSTALL_PREFIX}/lib) +set(libdir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}) # construct ${BOOST_LDADD} from ${Boost_LIBRARIES} # forming "-L/some/path -lboost_a -L/other/path -lboost_b" from @@ -169,11 +178,11 @@ configure_file(${CMAKE_SOURCE_DIR}/libi2ncommon_utils.pc.in ${CMAKE_BINARY_DIR}/ install(FILES ${CMAKE_BINARY_DIR}/libi2ncommon.pc ${CMAKE_BINARY_DIR}/libi2ncommon_config.pc ${CMAKE_BINARY_DIR}/libi2ncommon_utils.pc - DESTINATION lib/pkgconfig) + DESTINATION lib${LIB_SUFFIX}/pkgconfig) if (BUILD_XMLLIB) configure_file(${CMAKE_SOURCE_DIR}/libi2ncommon_xml.pc.in ${CMAKE_BINARY_DIR}/libi2ncommon_xml.pc @ONLY) - install(FILES ${CMAKE_BINARY_DIR}/libi2ncommon_xml.pc DESTINATION lib/pkgconfig) + install(FILES ${CMAKE_BINARY_DIR}/libi2ncommon_xml.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig) endif(BUILD_XMLLIB) diff --git a/configlib/CMakeLists.txt b/configlib/CMakeLists.txt index 13d43b0..c24f6cc 100644 --- a/configlib/CMakeLists.txt +++ b/configlib/CMakeLists.txt @@ -14,7 +14,7 @@ set_target_properties(i2ncommon_config PROPERTIES VERSION ${VERSION} SOVERSION 3 install(TARGETS i2ncommon_config - LIBRARY DESTINATION lib + LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT sharedlibs) install(FILES ${cpp_headers} diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f29e1ce..d0b0a6d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -62,7 +62,7 @@ target_link_libraries(i2ncommon ${Boost_IOSTREAMS_LIBRARIES} ${Boost_THREAD_LIBR set_target_properties(i2ncommon PROPERTIES VERSION ${VERSION} SOVERSION 4) install(TARGETS i2ncommon - LIBRARY DESTINATION lib + LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT sharedlibs) install(FILES ${cpp_headers} diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt index 63490b2..db5f62d 100644 --- a/utils/CMakeLists.txt +++ b/utils/CMakeLists.txt @@ -16,7 +16,7 @@ set_target_properties(i2ncommon_utils PROPERTIES VERSION ${VERSION} SOVERSION 3) install(TARGETS i2ncommon_utils - LIBRARY DESTINATION lib + LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT sharedlibs) install(FILES ${cpp_headers} diff --git a/xmllib/CMakeLists.txt b/xmllib/CMakeLists.txt index 203f58e..bd58b4b 100644 --- a/xmllib/CMakeLists.txt +++ b/xmllib/CMakeLists.txt @@ -19,7 +19,7 @@ target_link_libraries(i2ncommon_xml ${Xmlpp_LIBRARIES}) set_target_properties(i2ncommon_xml PROPERTIES VERSION ${VERSION} SOVERSION 3) install(TARGETS i2ncommon_xml - LIBRARY DESTINATION lib + LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT sharedlibs) install(FILES ${cpp_headers} -- 1.7.1