summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Wenzel <Alexander.AW.Wenzel@bmw.de>2014-01-27 08:54:26 +0100
committerAlexander Wenzel <Alexander.AW.Wenzel@bmw.de>2014-04-01 09:43:18 +0200
commitbf17d3ab6577f5ac8482f63a8a87a73d5077db1c (patch)
treef0fa4ec0dda191f8929d71a375c814cecc540d27
parenta2ab2fcbf9550e79205d7ef04148e73879a4d736 (diff)
downloadDLT-daemon-bf17d3ab6577f5ac8482f63a8a87a73d5077db1c.tar.gz
Use LIB_SUFFIX as lib installation path.
Signed-off-by: Alexander Wenzel <Alexander.AW.Wenzel@bmw.de>
-rw-r--r--CMakeLists.txt4
-rw-r--r--src/lib/CMakeLists.txt4
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)