diff options
| author | Christian Linke <Christian.Linke@bmw.de> | 2016-04-26 04:11:30 -0700 |
|---|---|---|
| committer | Christian Linke <Christian.Linke@bmw.de> | 2016-04-26 04:11:30 -0700 |
| commit | 5d1f59f175bdad1183d7ef9f5b4dfbbb840eb46d (patch) | |
| tree | 4d0408c446ba962e239234025b322b86c5ba1260 | |
| parent | 08a54bee2198b948580537033c8945ca5bd6e7f8 (diff) | |
| download | audiomanager-5d1f59f175bdad1183d7ef9f5b4dfbbb840eb46d.tar.gz | |
remove parallel installations of the Audiomanager packages
Signed-off-by: Christian Linke <Christian.Linke@bmw.de>
| -rw-r--r-- | AudioManagerCore/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | AudioManagerUtilities/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | CMakeLists.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/AudioManagerCore/CMakeLists.txt b/AudioManagerCore/CMakeLists.txt index 8666cce..e47cb74 100644 --- a/AudioManagerCore/CMakeLists.txt +++ b/AudioManagerCore/CMakeLists.txt @@ -95,7 +95,7 @@ write_basic_package_version_file( install( FILES ${CMAKE_CURRENT_BINARY_DIR}/AudioManagerCoreConfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/AudioManagerCoreConfigVersion.cmake - DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/AudioManagerCore-${DAEMONVERSION}) + DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/AudioManagerCore) INSTALL(DIRECTORY "${AUDIOMANAGER_CORE}/include/" DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/${LIB_INSTALL_SUFFIX}/AudioManagerCore diff --git a/AudioManagerUtilities/CMakeLists.txt b/AudioManagerUtilities/CMakeLists.txt index 6200a69..98abc69 100644 --- a/AudioManagerUtilities/CMakeLists.txt +++ b/AudioManagerUtilities/CMakeLists.txt @@ -149,7 +149,7 @@ write_basic_package_version_file( install( FILES ${CMAKE_CURRENT_BINARY_DIR}/AudioManagerUtilitiesConfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/AudioManagerUtilitiesConfigVersion.cmake - DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/AudioManagerUtilities-${DAEMONVERSION}) + DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/AudioManagerUtilities) INSTALL(DIRECTORY "include/" DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/${LIB_INSTALL_SUFFIX}/AudioManagerUtilities diff --git a/CMakeLists.txt b/CMakeLists.txt index 791e8ed..3aee934 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -172,7 +172,7 @@ add_subdirectory (AudioManagerDaemon) install( FILES ${CMAKE_BINARY_DIR}/AudioManagerConfig.cmake ${CMAKE_BINARY_DIR}/AudioManagerConfigVersion.cmake - DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/AudioManager-${DAEMONVERSION} + DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/AudioManager ) install(FILES ${CMAKE_BINARY_DIR}/audiomanager.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT devel) |