diff options
| author | Jens Lorenz <jlorenz@de.adit-jv.com> | 2015-06-23 11:56:31 +0200 |
|---|---|---|
| committer | Christian Linke <christian.linke@bmw.de> | 2015-07-06 17:38:32 +0100 |
| commit | d7419f5ebc895a492593a7f31c715ee450d9059e (patch) | |
| tree | 9d4d7270aa88984af7a2404ab376c8ea9cca9da4 | |
| parent | a1124a4c35ec75451d4c4d821fb8897a98e0e21b (diff) | |
| download | audiomanager-d7419f5ebc895a492593a7f31c715ee450d9059e.tar.gz | |
Fixed cmake issues
Signed-off-by: Jens Lorenz <jlorenz@de.adit-jv.com>
| -rw-r--r-- | AudioManagerDaemon/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | CMakeLists.txt | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/AudioManagerDaemon/CMakeLists.txt b/AudioManagerDaemon/CMakeLists.txt index 659d627..e818eaf 100644 --- a/AudioManagerDaemon/CMakeLists.txt +++ b/AudioManagerDaemon/CMakeLists.txt @@ -86,7 +86,7 @@ if(WITH_SYSTEMD_WATCHDOG) src/CAmWatchdog.cpp) set (AM_LINK_LIBS ${AM_LINK_LIBS} - ${SYSTEMD_LIBRARIES) + ${SYSTEMD_LIBRARIES}) endif(WITH_SYSTEMD_WATCHDOG) if (NOT SYSTEMD_FOUND) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7ae5def..b7f3159 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,6 +18,8 @@ cmake_minimum_required(VERSION 2.8.8) +project(AudioManagerDeamon) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake) include ( CMakeDependentOption ) @@ -25,8 +27,6 @@ include ( MacroVersionFromGit ) include ( MacroInterfaceVersions ) include ( CMakePackageConfigHelpers ) -project(AudioManagerDeamon) - if (NOT ${CMAKE_TOOLCHAIN_FILE} EQUAL "") message(STATUS "Using CMAKE_TOOLCHAIN_FILE='${CMAKE_TOOLCHAIN_FILE}'" ) endif (NOT ${CMAKE_TOOLCHAIN_FILE} EQUAL "") @@ -227,7 +227,7 @@ set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS} -g -Wall -Wextra -std=gnu++0x -D_ set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -O2 -fno-common -rdynamic -std=gnu++0x -fno-strict-aliasing -DNDEBUG") configure_package_config_file ( - ${CMAKE_MODULE_PATH}/audiomanagerConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/audiomanagerConfig.cmake + ${CMAKE_SOURCE_DIR}/cmake/audiomanagerConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/audiomanagerConfig.cmake INSTALL_DESTINATION lib/${LIB_INSTALL_SUFFIX}/cmake PATH_VARS AUDIO_INCLUDE_FOLDER ) |