diff options
| author | Stefan Vacek <stefan.vacek@intel.com> | 2015-05-15 10:20:10 +0200 |
|---|---|---|
| committer | Alexander Wenzel <Alexander.AW.Wenzel@bmw.de> | 2015-06-17 08:51:07 +0200 |
| commit | 7f3b861410374effbba07ad71c1f1af7d922b713 (patch) | |
| tree | 55b274269701173045da57e2e1bc793e2cd990f1 /CMakeLists.txt | |
| parent | 8fbee2d4e451a91d0c8dbf1fa5822c1776845f8c (diff) | |
| download | DLT-daemon-7f3b861410374effbba07ad71c1f1af7d922b713.tar.gz | |
Fix installation paths on x86_64 (lib64 instead of lib)
Signed-off-by: Stefan Vacek <stefan.vacek@intel.com>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 53362af..e569f6b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,12 +15,13 @@ # @licence end@ ####### -cmake_minimum_required( VERSION 2.6 ) +cmake_minimum_required( VERSION 2.8.5 ) project( automotive-dlt ) mark_as_advanced( CMAKE_BACKWARDS_COMPATIBILITY) set( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE ) +include ( GNUInstallDirs ) # Set version parameters set( DLT_MAJOR_VERSION 2) set( DLT_MINOR_VERSION 12) @@ -114,11 +115,9 @@ 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_INSTALL_DIR}/pkgconfig COMPONENT devel) +install(FILES ${PROJECT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT devel) IF(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr") set(CONFIGURATION_FILES_DIR "/etc") |