diff options
| author | Aleksandar Donchev <Aleksander.Donchev@partner.bmw.de> | 2014-12-15 11:53:12 +0100 |
|---|---|---|
| committer | Aleksandar Donchev <Aleksander.Donchev@partner.bmw.de> | 2015-01-13 14:48:17 +0100 |
| commit | 77d50618acf2d4898dee996acc33e92460e209a3 (patch) | |
| tree | 0b5eebe356dee17c45727779a718b33cece8086e | |
| parent | e8112791ca7f51015f88fec231a869dfbc9d2d0f (diff) | |
| download | audiomanager-77d50618acf2d4898dee996acc33e92460e209a3.tar.gz | |
* Audiomanager share folder exposed as cmake variable.
Signed-off-by: Christian Linke <christian.linke@bmw.de>
| -rw-r--r-- | AudioManagerDaemon/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cmake/config.cmake | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/AudioManagerDaemon/CMakeLists.txt b/AudioManagerDaemon/CMakeLists.txt index e263aea..e9c5696 100644 --- a/AudioManagerDaemon/CMakeLists.txt +++ b/AudioManagerDaemon/CMakeLists.txt @@ -256,7 +256,7 @@ IF(WITH_NSM) COMMAND cp "${CMAKE_SOURCE_DIR}/cmake/LifecycleConsumer.xml" ${NSM_INTROSPECTION_FILE} COMMAND cp "${CMAKE_BINARY_DIR}/AudioManager_dbus.conf" ${EXECUTABLE_OUTPUT_PATH}) ELSE(USE_BUILD_LIBS) - SET(NSM_INTROSPECTION_FILE ${CMAKE_INSTALL_PREFIX}/share/audiomanager/LifecycleConsumer.xml) + SET(NSM_INTROSPECTION_FILE ${AM_SHARE_FOLDER}/LifecycleConsumer.xml) INSTALL( FILES ${CMAKE_SOURCE_DIR}/cmake/LifecycleConsumer.xml #${CMAKE_BINARY_DIR}/AudioManager_dbus.conf DESTINATION "${NSM_INTROSPECTION_FILE}" diff --git a/CMakeLists.txt b/CMakeLists.txt index 72fd3da..5ae6309 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -248,6 +248,8 @@ if(WITH_PLUGIN_CONTROL) add_subdirectory (PluginControlInterface) endif(WITH_PLUGIN_CONTROL) +SET(AM_SHARE_FOLDER ${CMAKE_INSTALL_PREFIX}/share/audiomanager) + add_subdirectory (AudioManagerDaemon) # uninstall target diff --git a/cmake/config.cmake b/cmake/config.cmake index 107719a..fcfdc7f 100644 --- a/cmake/config.cmake +++ b/cmake/config.cmake @@ -31,6 +31,7 @@ #cmakedefine NSM_PATH "@NSM_PATH@" #cmakedefine NSM_INTERFACE "@NSM_INTERFACE@" #cmakedefine NSM_INTROSPECTION_FILE "@NSM_INTROSPECTION_FILE@" +#cmakedefine AM_SHARE_FOLDER "@AM_SHARE_FOLDER@" enum { DYNAMIC_ID_BOUNDARY = @DYNAMIC_ID_BOUNDARY@ }; |