diff options
| author | Aleksandar Donchev <Aleksander.Donchev@partner.bmw.de> | 2015-06-02 10:57:57 +0200 |
|---|---|---|
| committer | Aleksandar Donchev <Aleksander.Donchev@partner.bmw.de> | 2015-06-02 10:57:57 +0200 |
| commit | 02987671e5335cb767e0a0c64391dd44dec9e737 (patch) | |
| tree | 3387e6ffe038b683e5c05c921688f6cb70390296 /CMakeLists.txt | |
| parent | ea0a30e1fa93d2ac79749c669a36d59e1bac2ab5 (diff) | |
| download | audiomanager-02987671e5335cb767e0a0c64391dd44dec9e737.tar.gz | |
* Common-API 3 integration and fix for the asserts order in the router tests.
Signed-off-by: Christian Linke <christian.linke@bmw.de>
Diffstat (limited to 'CMakeLists.txt')
| -rwxr-xr-x | CMakeLists.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 079035f..45ffe41 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -125,7 +125,7 @@ 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 - CACHE STRINGS "The share folder for the AM. Some DBus xmls will be placed here and so on") + 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) set(AUDIO_INCLUDE_FOLDER ${CMAKE_SOURCE_DIR}/include) @@ -167,8 +167,6 @@ else(USE_BUILD_LIBS) endif(NOT DEFINED CONTROLLER_PLUGIN) endif(USE_BUILD_LIBS) -configure_file( ${CMAKE_SOURCE_DIR}/AudioManagerDaemon/docx/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/DoxyFile ) -configure_file( ${CMAKE_SOURCE_DIR}/cmake/config.cmake.in ${CMAKE_BINARY_DIR}/include/config.h ) if (WITH_ENABLED_IPC STREQUAL "NONE") set (ENABLE_NSM OFF) @@ -269,3 +267,6 @@ add_custom_target(test-install "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=tests -P "${CMAKE_BINARY_DIR}/cmake_install.cmake" ) + +configure_file( ${CMAKE_SOURCE_DIR}/AudioManagerDaemon/docx/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/DoxyFile ) +configure_file( ${CMAKE_SOURCE_DIR}/cmake/config.cmake.in ${CMAKE_BINARY_DIR}/include/config.h ) |