From bf17d3ab6577f5ac8482f63a8a87a73d5077db1c Mon Sep 17 00:00:00 2001 From: Alexander Wenzel Date: Mon, 27 Jan 2014 08:54:26 +0100 Subject: Use LIB_SUFFIX as lib installation path. Signed-off-by: Alexander Wenzel --- CMakeLists.txt | 4 +++- src/lib/CMakeLists.txt | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 983b2de..6e841c7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -106,9 +106,11 @@ ELSE (${WITH_DOC} STREQUAL "OFF") SET(PACKAGE_DOC "") ENDIF(${WITH_DOC} STREQUAL "OFF") +set(LIB_INSTALL_DIR lib${LIB_SUFFIX}) + configure_file(${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.spec.in ${PROJECT_BINARY_DIR}/${PROJECT_NAME}.spec) configure_file(${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.pc.in ${PROJECT_BINARY_DIR}/${PROJECT_NAME}.pc @ONLY) -install(FILES ${PROJECT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION lib/pkgconfig COMPONENT devel) +install(FILES ${PROJECT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig COMPONENT devel) add_subdirectory( cmake ) diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt index cceccd2..d64762b 100644 --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@ -22,8 +22,8 @@ target_link_libraries(dlt rt ${CMAKE_THREAD_LIBS_INIT}) set_target_properties(dlt PROPERTIES VERSION ${DLT_VERSION} SOVERSION ${DLT_MAJOR_VERSION}) install(TARGETS dlt - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib/static + LIBRARY DESTINATION ${LIB_INSTALL_DIR} + ARCHIVE DESTINATION ${LIB_INSTALL_DIR}/static COMPONENT base) -- cgit v1.2.1