diff options
author | Christian Linke <Christian.Linke@bmw.de> | 2016-03-01 23:36:34 -0800 |
---|---|---|
committer | Christian Linke <Christian.Linke@bmw.de> | 2016-03-01 23:36:34 -0800 |
commit | 3b7254a3c3bacef46afebd36f027a16c2845ee11 (patch) | |
tree | 5c7e957ef3597e1c082ae8593b18e88cdfb845e5 | |
parent | 6dfc4665743e61d1e4dbed634c41265dbbdeba77 (diff) | |
download | audiomanager-3b7254a3c3bacef46afebd36f027a16c2845ee11.tar.gz |
Fix issues with cmake cross build and yocto
Signed-off-by: Christian Linke <Christian.Linke@bmw.de>
-rwxr-xr-x | CMakeLists.txt | 5 | ||||
-rw-r--r-- | cmake/AudioManagerConfig.cmake.in | 4 | ||||
-rw-r--r-- | cmake/AudioManagerCoreConfig.cmake.in | 3 | ||||
-rw-r--r-- | cmake/AudioManagerUtilitiesConfig.cmake.in | 4 | ||||
-rw-r--r-- | cmake/audiomanager.pc.in | 2 | ||||
-rw-r--r-- | cmake/audiomanagercore.pc.in | 2 | ||||
-rw-r--r-- | cmake/audiomanagerutilities.pc.in | 2 |
7 files changed, 9 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f8d0dc3..ac2c043 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -126,10 +126,13 @@ if(NOT DEFINED CONTROLLER_PLUGIN_DIR) endif(NOT DEFINED CONTROLLER_PLUGIN_DIR) ##global build flags set(CPACK_RPM_COMPONENT_INSTALL ON) -set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -pedantic -rdynamic -Wno-variadic-macros") +set (AUDIOMANAGER_CMAKE_CXX_FLAGS "-std=gnu++11 -pedantic -rdynamic -Wno-variadic-macros") + +set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${AUDIOMANAGER_CMAKE_CXX_FLAGS}") set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS} -g -DDEBUG") set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -O2 -DNDEBUG") + if(WITH_TESTS) #check if we can find the google stuff pkg_check_modules (GTEST "gtest >= 1.6.0") diff --git a/cmake/AudioManagerConfig.cmake.in b/cmake/AudioManagerConfig.cmake.in index a079fef..1c93dd8 100644 --- a/cmake/AudioManagerConfig.cmake.in +++ b/cmake/AudioManagerConfig.cmake.in @@ -13,9 +13,7 @@ set(LIB_COMMAND_INTERFACE_VERSION "@LIB_COMMAND_INTERFACE_VERSION@") set(DEFAULT_PLUGIN_COMMAND_DIR "@DEFAULT_PLUGIN_COMMAND_DIR@") set(DEFAULT_PLUGIN_ROUTING_DIR "@DEFAULT_PLUGIN_ROUTING_DIR@") set(CONTROLLER_PLUGIN_DIR "@CONTROLLER_PLUGIN_DIR@") -set(CMAKE_CXX_FLAGS "@CMAKE_CXX_FLAGS@") -set(CMAKE_CXX_FLAGS_DEBUG "@CMAKE_CXX_FLAGS_DEBUG@") -set(CMAKE_CXX_FLAGS_RELEASE "@CMAKE_CXX_FLAGS_RELEASE@") +set(AUDIOMANAGER_CMAKE_CXX_FLAGS "@AUDIOMANAGER_CMAKE_CXX_FLAGS@") set(WITH_CAPI_WRAPPER "@WITH_CAPI_WRAPPER@") set(WITH_DBUS_WRAPPER "@WITH_DBUS_WRAPPER@") set(WITH_SHARED_UTILITIES "@WITH_SHARED_UTILITIES@") diff --git a/cmake/AudioManagerCoreConfig.cmake.in b/cmake/AudioManagerCoreConfig.cmake.in index b7fe6f9..bba370b 100644 --- a/cmake/AudioManagerCoreConfig.cmake.in +++ b/cmake/AudioManagerCoreConfig.cmake.in @@ -4,9 +4,6 @@ set_and_check(AudioManagerCore_INCLUDE_DIRS ${PACKAGE_PREFIX_DIR}/include/@LIB_I find_library(AudioManagerCore_LIBRARIES NAMES AudioManagerCore HINTS ${PACKAGE_PREFIX_DIR}/lib) set(DAEMONVERSION "@DAEMONVERSION@") -set(CMAKE_CXX_FLAGS "@CMAKE_CXX_FLAGS@") -set(CMAKE_CXX_FLAGS_DEBUG "@CMAKE_CXX_FLAGS_DEBUG@") -set(CMAKE_CXX_FLAGS_RELEASE "@CMAKE_CXX_FLAGS_RELEASE@") set(WITH_SHARED_CORE "@WITH_SHARED_CORE@") diff --git a/cmake/AudioManagerUtilitiesConfig.cmake.in b/cmake/AudioManagerUtilitiesConfig.cmake.in index 86b7f61..86eafc1 100644 --- a/cmake/AudioManagerUtilitiesConfig.cmake.in +++ b/cmake/AudioManagerUtilitiesConfig.cmake.in @@ -7,9 +7,7 @@ set(AudioManagerUtilities_INCLUDE_DIRS ${AudioManagerUtilities_INCLUDE_DIRS} @AU set(AudioManagerUtilities_LIBRARIES @AUDIO_MANAGER_UTILITIES_LIBS@ ${AudioManagerUtilities_LIBRARY}) set(DAEMONVERSION "@DAEMONVERSION@") -set(CMAKE_CXX_FLAGS "@CMAKE_CXX_FLAGS@") -set(CMAKE_CXX_FLAGS_DEBUG "@CMAKE_CXX_FLAGS_DEBUG@") -set(CMAKE_CXX_FLAGS_RELEASE "@CMAKE_CXX_FLAGS_RELEASE@") +set(AUDIOMANAGER_CMAKE_CXX_FLAGS "@AUDIOMANAGER_CMAKE_CXX_FLAGS@") set(WITH_CAPI_WRAPPER "@WITH_CAPI_WRAPPER@") set(WITH_DBUS_WRAPPER "@WITH_DBUS_WRAPPER@") set(WITH_SHARED_UTILITIES "@WITH_SHARED_UTILITIES@") diff --git a/cmake/audiomanager.pc.in b/cmake/audiomanager.pc.in index 5c5ff46..a88bb43 100644 --- a/cmake/audiomanager.pc.in +++ b/cmake/audiomanager.pc.in @@ -6,5 +6,5 @@ Description: The Audiomanager Version: @DAEMONVERSION@ Requires: Libs: -L${libdir} -Cflags: -I${includedir} @CMAKE_CXX_FLAGS@ +Cflags: -I${includedir} @AUDIOMANAGER_CMAKE_CXX_FLAGS@ diff --git a/cmake/audiomanagercore.pc.in b/cmake/audiomanagercore.pc.in index 6e2eea1..089c042 100644 --- a/cmake/audiomanagercore.pc.in +++ b/cmake/audiomanagercore.pc.in @@ -6,5 +6,5 @@ Description: The Audiomanager Core Lib Version: @AudioManagerCore_VERSION_STRING@ Requires: AudioManagerUtilities Libs: -L${libdir} lAudioManagerCore -Cflags: -I${includedir} @CMAKE_CXX_FLAGS@ +Cflags: -I${includedir} diff --git a/cmake/audiomanagerutilities.pc.in b/cmake/audiomanagerutilities.pc.in index 8469848..9874543 100644 --- a/cmake/audiomanagerutilities.pc.in +++ b/cmake/audiomanagerutilities.pc.in @@ -6,5 +6,5 @@ Description: The Audiomanager Utilities Version: @AudioManagerUtilities_VERSION_STRING@ Requires: Libs: -L${libdir} -lAudioManagerUtilities -Cflags: -I${includedir} @CMAKE_CXX_FLAGS@ +Cflags: -I${includedir} @AUDIOMANAGER_CMAKE_CXX_FLAGS@ |