diff options
| author | Aleksandar Donchev <Aleksander.Donchev@partnerbmw.de> | 2015-05-28 14:08:37 +0200 |
|---|---|---|
| committer | Aleksandar Donchev <Aleksander.Donchev@partner.bmw.de> | 2015-06-02 10:58:48 +0200 |
| commit | 7248efe3968614ba420a9b5230b7e50e08de826f (patch) | |
| tree | 0cda2b4f09969bba2acf5b4d626c564d5f7e4be1 | |
| parent | 02987671e5335cb767e0a0c64391dd44dec9e737 (diff) | |
| download | audiomanager-7248efe3968614ba420a9b5230b7e50e08de826f.tar.gz | |
* Fix for cmake complain about an explicit null terminated string and AM_SHARE_FOLDER to point the audiomanager subfolder in /usr/local/share.
* Make dir command for bin folder is now executed outside the WITH_NSM clause.
Signed-off-by: Christian Linke <christian.linke@bmw.de>
| -rwxr-xr-x | CMakeLists.txt | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 45ffe41..1787a0c 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -82,10 +82,10 @@ elseif(WITH_ENABLED_IPC STREQUAL "NONE") set (WITH_DBUS_WRAPPER OFF CACHE INTERNAL "hide this!" FORCE) endif () -set(DBUS_SERVICE_PREFIX "org.genivi.audiomanager\0" +set(DBUS_SERVICE_PREFIX "org.genivi.audiomanager" CACHE PROPERTY "The dbus service prefix for the AM - only changable for legacy dbus") -set(DBUS_SERVICE_OBJECT_PATH "/org/genivi/audiomanager\0" +set(DBUS_SERVICE_OBJECT_PATH "/org/genivi/audiomanager" CACHE PROPERTY "The service object path of the AM - only changable for legacy dbus") set(DEFAULT_TELNETPORT 6080 @@ -124,7 +124,7 @@ set(TEST_EXECUTABLE_INSTALL_PATH "~/tests" set(DOC_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/doc CACHE STRINGS "The doxygen documentation will be placed here") -set(AM_SHARE_FOLDER ${CMAKE_INSTALL_PREFIX}/share +set(AM_SHARE_FOLDER ${CMAKE_INSTALL_PREFIX}/share/audiomanager CACHE STRINGS "The share folder for the AM. Some DBus xmls will be placed here and so on") set(AUDIOMANAGER_INCLUDE_FOLDER ${CMAKE_BINARY_DIR}/include) @@ -178,12 +178,15 @@ if (NOT WITH_DBUS_WRAPPER AND NOT WITH_CAPI_WRAPPER) set (WITH_NSM OFF) endif (NOT WITH_DBUS_WRAPPER AND NOT WITH_CAPI_WRAPPER) + +if(USE_BUILD_LIBS) + execute_process(COMMAND mkdir -p "${CMAKE_CURRENT_BINARY_DIR}/bin") +endif(USE_BUILD_LIBS) + if(WITH_NSM AND WITH_DBUS_WRAPPER) if(USE_BUILD_LIBS) set(NSM_INTROSPECTION_FILE ${EXECUTABLE_OUTPUT_PATH}/bin/LifeCycleConsumer.xml) - execute_process( - COMMAND mkdir -p "${CMAKE_CURRENT_BINARY_DIR}/bin" - COMMAND cp "${CMAKE_SOURCE_DIR}/Foo/LifecycleConsumer.xml" ${NSM_INTROSPECTION_FILE}) + execute_process(COMMAND cp "${CMAKE_SOURCE_DIR}/Foo/LifecycleConsumer.xml" ${NSM_INTROSPECTION_FILE}) else(USE_BUILD_LIBS) set(NSM_INTROSPECTION_FILE ${AM_SHARE_FOLDER}/LifecycleConsumer.xml) INSTALL( |