summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuerra Mattia <mguerra@de.adit-jv.com>2017-05-19 14:39:35 +0200
committerJens Lorenz <jlorenz@de.adit-jv.com>2017-09-29 11:42:01 +0200
commit4bfe4632624bc3ee13fa85f0ffdc23d7618e65e3 (patch)
tree433c85e19c220587e9ae105bcda31c15fbb3bca5
parent3e9f7977dc599b6a91e875c8239480f212a4cd3a (diff)
downloadaudiomanager-4bfe4632624bc3ee13fa85f0ffdc23d7618e65e3.tar.gz
CMake: Use GNUInstalDirs destinations
Replace hardcoded "lib" with ${CMAKE_INSTALL_LIBDIR} to provide multilib support. Signed-off-by: Frederik Sdun <frederik_sdun@mentor.com> Signed-off-by: Mikhail Durnev <mikhail_durnev@mentor.com>
-rw-r--r--AudioManagerCore/CMakeLists.txt2
-rw-r--r--AudioManagerDaemon/CMakeLists.txt4
-rwxr-xr-xCMakeLists.txt4
3 files changed, 5 insertions, 5 deletions
diff --git a/AudioManagerCore/CMakeLists.txt b/AudioManagerCore/CMakeLists.txt
index 7be36e9..1d50570 100644
--- a/AudioManagerCore/CMakeLists.txt
+++ b/AudioManagerCore/CMakeLists.txt
@@ -89,7 +89,7 @@ install(FILES ${CMAKE_BINARY_DIR}/audiomanagercore.pc DESTINATION ${CMAKE_INSTAL
configure_package_config_file (
${CMAKE_SOURCE_DIR}/cmake/AudioManagerCoreConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/AudioManagerCoreConfig.cmake
- INSTALL_DESTINATION lib/${LIB_INSTALL_SUFFIX}/cmake
+ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/${LIB_INSTALL_SUFFIX}/cmake
PATH_VARS AUDIO_INCLUDE_FOLDER )
write_basic_package_version_file(
diff --git a/AudioManagerDaemon/CMakeLists.txt b/AudioManagerDaemon/CMakeLists.txt
index 9aa0754..786dd2d 100644
--- a/AudioManagerDaemon/CMakeLists.txt
+++ b/AudioManagerDaemon/CMakeLists.txt
@@ -42,12 +42,12 @@ TARGET_LINK_LIBRARIES(AudioManager AudioManagerCore ${AUDIO_MANAGER_CORE_LIBS})
ADD_DEPENDENCIES(AudioManager AudioManagerCore)
INSTALL(TARGETS AudioManager
- RUNTIME DESTINATION bin
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ
COMPONENT bin)
INSTALL(DIRECTORY "${AUDIO_INCLUDE_FOLDER}/"
- DESTINATION ${CMAKE_INSTALL_PREFIX}/include/${LIB_INSTALL_SUFFIX}
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${LIB_INSTALL_SUFFIX}
COMPONENT dev)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5c70c61..9f3bbe7 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -76,13 +76,13 @@ set(DYNAMIC_ID_BOUNDARY 101
set(LIB_INSTALL_SUFFIX "audiomanager"
CACHE STRINGS "The suffix used for installation of the plugins")
-set(TEST_EXECUTABLE_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/bin
+set(TEST_EXECUTABLE_INSTALL_PATH ${CMAKE_INSTALL_BINDIR}
CACHE STRINGS "The test binaries will be installed here")
set(DOC_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/doc/AudioManager
CACHE STRINGS "The doxygen documentation will be placed here")
-set(AM_SHARE_FOLDER ${CMAKE_INSTALL_PREFIX}/share/audiomanager
+set(AM_SHARE_FOLDER ${CMAKE_INSTALL_DATAROOTDIR}/audiomanager
CACHE STRINGS "The share folder for the AM. Some DBus xmls will be placed here and so on")
set(AM_MAP_CAPACITY 10