From 7f3b861410374effbba07ad71c1f1af7d922b713 Mon Sep 17 00:00:00 2001 From: Stefan Vacek Date: Fri, 15 May 2015 10:20:10 +0200 Subject: Fix installation paths on x86_64 (lib64 instead of lib) Signed-off-by: Stefan Vacek --- CMakeLists.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'CMakeLists.txt') 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") -- cgit v1.2.1