diff options
author | Christian Linke <Christian.Linke@bmw.de> | 2016-02-11 07:28:47 +0100 |
---|---|---|
committer | Christian Linke <Christian.Linke@bmw.de> | 2016-02-15 09:00:59 +0100 |
commit | 5bcd206b9270d9a79e212f91723ea1a08a4d4859 (patch) | |
tree | 55b0cd4d07fbd7ebfd15d58d02e9cae6ae61b127 /cmake | |
parent | 59080ecc2c8840fd85c561adea3f85f5344534a8 (diff) | |
download | audiomanager-5bcd206b9270d9a79e212f91723ea1a08a4d4859.tar.gz |
* rework of the build structure, adopt to standard cmake package structure7.4
* check versions when loading the libs
* introduction of the AudioManagerCore
* give control plugin as file or directory
* remove SQLITE
* either find and use gmock or build and install it
* fixed [Bug 411]
* compile flag gnu11 is now used
Signed-off-by: Christian Linke <Christian.Linke@bmw.de>
Signed-off-by: Christian Linke <Christian.Linke@bmw.de>
Diffstat (limited to 'cmake')
-rw-r--r-- | cmake/AudioManagerConfig.cmake.in | 35 | ||||
-rw-r--r-- | cmake/AudioManagerCoreConfig.cmake.in | 17 | ||||
-rw-r--r-- | cmake/AudioManagerUtilitiesConfig.cmake.in | 17 | ||||
-rw-r--r-- | cmake/MacroVersionFromGit.cmake | 1 | ||||
-rw-r--r-- | cmake/audiomanagerConfig.cmake.in | 44 | ||||
-rw-r--r-- | cmake/audiomanagercore.pc.in | 10 | ||||
-rw-r--r-- | cmake/audiomanagerutilities.pc.in | 4 | ||||
-rw-r--r-- | cmake/config.cmake.in | 7 | ||||
-rw-r--r-- | cmake/gmock.pc.in | 9 | ||||
-rw-r--r-- | cmake/gtest.pc.in | 9 |
10 files changed, 103 insertions, 50 deletions
diff --git a/cmake/AudioManagerConfig.cmake.in b/cmake/AudioManagerConfig.cmake.in new file mode 100644 index 0000000..2668767 --- /dev/null +++ b/cmake/AudioManagerConfig.cmake.in @@ -0,0 +1,35 @@ +@PACKAGE_INIT@ + +set_and_check(AudioManager_INCLUDE_DIRS @CMAKE_INSTALL_PREFIX@/include/@LIB_INSTALL_SUFFIX@) + +set(DAEMONVERSION "@DAEMONVERSION@") +set(TEST_EXECUTABLE_INSTALL_PATH "@TEST_EXECUTABLE_INSTALL_PATH@") +set(AM_SHARE_FOLDER "@AM_SHARE_FOLDER@") +set(CONTROLLER_PLUGIN "@CONTROLLER_PLUGIN@") +set(LIB_INSTALL_SUFFIX "@LIB_INSTALL_SUFFIX@") +set(LIB_CONTROL_INTERFACE_VERSION "@LIB_CONTROL_INTERFACE_VERSION@") +set(LIB_ROUTING_INTERFACE_VERSION "@LIB_ROUTING_INTERFACE_VERSION@") +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(WITH_CAPI_WRAPPER "@WITH_CAPI_WRAPPER@") +set(WITH_DBUS_WRAPPER "@WITH_DBUS_WRAPPER@") +set(WITH_SHARED_UTILITIES "@WITH_SHARED_UTILITIES@") +set(WITH_SHARED_CORE "@WITH_SHARED_CORE@") + +check_required_components(AudioManagerDaemon) +if (WITH_SHARED_UTILITIES) + check_required_components(AudioManagerUtilities) +endif (WITH_SHARED_UTILITIES) +if (WITH_SHARED_CORE) + check_required_components(AudioManagerCore) +endif(WITH_SHARED_CORE) + + + + + diff --git a/cmake/AudioManagerCoreConfig.cmake.in b/cmake/AudioManagerCoreConfig.cmake.in new file mode 100644 index 0000000..f07cdef --- /dev/null +++ b/cmake/AudioManagerCoreConfig.cmake.in @@ -0,0 +1,17 @@ +@PACKAGE_INIT@ + +set_and_check(AudioManagerCore_INCLUDE_DIRS @CMAKE_INSTALL_PREFIX@/include/@LIB_INSTALL_SUFFIX@/AudioManagerCore) +find_library(AudioManagerCore_LIBRARIES NAMES AudioManagerCore HINTS ${@CMAKE_INSTALL_PREFIX@/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 new file mode 100644 index 0000000..5148f34 --- /dev/null +++ b/cmake/AudioManagerUtilitiesConfig.cmake.in @@ -0,0 +1,17 @@ +@PACKAGE_INIT@ + +set_and_check(AudioManagerUtilities_INCLUDE_DIRS @CMAKE_INSTALL_PREFIX@/include/@LIB_INSTALL_SUFFIX@/AudioManagerUtilities) +find_library(AudioManagerUtilities_LIBRARY NAMES AudioManagerUtilities HINTS ${@CMAKE_INSTALL_PREFIX@/lib}) + +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(WITH_CAPI_WRAPPER "@WITH_CAPI_WRAPPER@") +set(WITH_DBUS_WRAPPER "@WITH_DBUS_WRAPPER@") +set(WITH_SHARED_UTILITIES "@WITH_SHARED_UTILITIES@") + + + + diff --git a/cmake/MacroVersionFromGit.cmake b/cmake/MacroVersionFromGit.cmake index 1687443..d146754 100644 --- a/cmake/MacroVersionFromGit.cmake +++ b/cmake/MacroVersionFromGit.cmake @@ -17,7 +17,6 @@ endif(NOT DAEMONVERSION) message(STATUS "Build Version ${DAEMONVERSION}") - execute_process(COMMAND git log --pretty=short WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/CHANGELOG) diff --git a/cmake/audiomanagerConfig.cmake.in b/cmake/audiomanagerConfig.cmake.in deleted file mode 100644 index 4cff130..0000000 --- a/cmake/audiomanagerConfig.cmake.in +++ /dev/null @@ -1,44 +0,0 @@ -set(AudioManagerVersion @DAEMONVERSION@ ) - -@PACKAGE_INIT@ - - -set(CMAKE_MODULE_PATH "@CMAKE_MODULE_PATH@") -set(DAEMONVERSION "@DAEMONVERSION@") -set(TEST_EXECUTABLE_OUTPUT_PATH "@TEST_EXECUTABLE_OUTPUT_PATH@") -set(TEST_EXECUTABLE_INSTALL_PATH "@TEST_EXECUTABLE_INSTALL_PATH@") -set(AM_SHARE_FOLDER "@AM_SHARE_FOLDER@") -set(WITH_TESTS "@WITH_TESTS@") -set(AUDIOMANAGER_DAEMON_FOLDER "@AUDIOMANAGER_DAEMON_FOLDER@") -set(WITH_DOCUMENTATION "@WITH_DOCUMENTATION@") -set(WITH_DLT "@WITH_DLT@") -set(DBUS_SERVICE_PREFIX "@DBUS_SERVICE_PREFIX@") -set(DBUS_SERVICE_OBJECT_PATH "@DBUS_SERVICE_OBJECT_PATH@") -set(DYNAMIC_ID_BOUNDARY "@DYNAMIC_ID_BOUNDARY@") -set(DEFAULT_PLUGIN_COMMAND_DIR "@DEFAULT_PLUGIN_COMMAND_DIR@") -set(DEFAULT_PLUGIN_ROUTING_DIR "@DEFAULT_PLUGIN_ROUTING_DIR@") -set(CONTROLLER_PLUGIN "@CONTROLLER_PLUGIN@") -set(LIB_INSTALL_SUFFIX "@LIB_INSTALL_SUFFIX@") -set(COMMONAPI_DBUS_CONFIGURATIONS "@COMMONAPI_DBUS_CONFIGURATIONS") -set(LIB_CONTROL_INTERFACE_VERSION "@LIB_CONTROL_INTERFACE_VERSION") -set(LIB_ROUTING_INTERFACE_VERSION "@LIB_ROUTING_INTERFACE_VERSION") -set(LIB_COMMAND_INTERFACE_VERSION "@LIB_COMMAND_INTERFACE_VERSION") -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_UTILITIES_SRC "@AUDIOMANAGER_UTILITIES_SRC@") -set(COMMONAPI_VERSION_NUMBER "@COMMONAPI_VERSION_NUMBER@") -set(WITH_CAPI_WRAPPER "@WITH_CAPI_WRAPPER@") - - -IF(WITH_TESTS) - set_and_check(GOOGLE_MOCK_PROJECT_FOLDER "@GOOGLE_MOCK_PROJECT_FOLDER@") - set_and_check(GMOCK_INCLUDE_DIR "@GMOCK_INCLUDE_DIR@") - set_and_check(GOOGLE_TEST_INCLUDE_DIR "@GOOGLE_TEST_INCLUDE_DIR@") -ENDIF(WITH_TESTS) - -check_required_components(AudioManagerDaemon) -check_required_components(AudioManagerUtilities) - - - diff --git a/cmake/audiomanagercore.pc.in b/cmake/audiomanagercore.pc.in new file mode 100644 index 0000000..6e2eea1 --- /dev/null +++ b/cmake/audiomanagercore.pc.in @@ -0,0 +1,10 @@ +libdir=@CMAKE_INSTALL_PREFIX@/lib/@LIB_INSTALL_SUFFIX@ +includedir=@CMAKE_INSTALL_PREFIX@/include/@LIB_INSTALL_SUFFIX@/AudioManagerCore + +Name: Audiomanager Core +Description: The Audiomanager Core Lib +Version: @AudioManagerCore_VERSION_STRING@ +Requires: AudioManagerUtilities +Libs: -L${libdir} lAudioManagerCore +Cflags: -I${includedir} @CMAKE_CXX_FLAGS@ + diff --git a/cmake/audiomanagerutilities.pc.in b/cmake/audiomanagerutilities.pc.in index 1ae953a..2227cf1 100644 --- a/cmake/audiomanagerutilities.pc.in +++ b/cmake/audiomanagerutilities.pc.in @@ -1,9 +1,9 @@ libdir=@CMAKE_INSTALL_PREFIX@/lib/@LIB_INSTALL_SUFFIX@ -includedir=@CMAKE_INSTALL_PREFIX@/include/@LIB_INSTALL_SUFFIX@ +includedir=@CMAKE_INSTALL_PREFIX@/include/@LIB_INSTALL_SUFFIX@/AudioMangerUtilities Name: Audiomanager Utilities Description: The Audiomanager Utilities -Version: @DAEMONVERSION@ +Version: @AudioManagerUtilities_VERSION_STRING@ Requires: Libs: -L${libdir} -lAudioManagerUtilities Cflags: -I${includedir} @CMAKE_CXX_FLAGS@ diff --git a/cmake/config.cmake.in b/cmake/config.cmake.in index 9334dc1..a03a79f 100644 --- a/cmake/config.cmake.in +++ b/cmake/config.cmake.in @@ -5,16 +5,14 @@ #cmakedefine WITH_CAPI_WRAPPER #cmakedefine WITH_DBUS_WRAPPER -#cmakedefine WITH_DATABASE_STORAGE #cmakedefine WITH_DLT #cmakedefine WITH_TELNET #cmakedefine GLIB_DBUS_TYPES_TOLERANT #cmakedefine WITH_SYSTEMD_WATCHDOG -#cmakedefine SYSTEMD_FOUND #cmakedefine DEFAULT_PLUGIN_COMMAND_DIR "@DEFAULT_PLUGIN_COMMAND_DIR@" #cmakedefine DEFAULT_PLUGIN_ROUTING_DIR "@DEFAULT_PLUGIN_ROUTING_DIR@" -#cmakedefine CONTROLLER_PLUGIN "@CONTROLLER_PLUGIN@" +#cmakedefine CONTROLLER_PLUGIN_DIR "@CONTROLLER_PLUGIN_DIR@" #cmakedefine DEFAULT_TELNETPORT @DEFAULT_TELNETPORT@ #cmakedefine MAX_TELNETCONNECTIONS @MAX_TELNETCONNECTIONS@ @@ -32,6 +30,9 @@ #cmakedefine AM_MAP_CAPACITY @AM_MAP_CAPACITY@ #cmakedefine AM_MAX_CONNECTIONS @AM_MAX_CONNECTIONS@ #cmakedefine AM_MAX_MAIN_CONNECTIONS @AM_MAX_MAIN_CONNECTIONS@ +#cmakedefine LIB_COMMAND_INTERFACE_VERSION @LIB_COMMAND_INTERFACE_VERSION@ +#cmakedefine LIB_CONTROL_INTERFACE_VERSION @LIB_CONTROL_INTERFACE_VERSION@ +#cmakedefine LIB_ROUTING_INTERFACE_VERSION @LIB_ROUTING_INTERFACE_VERSION@ enum { DYNAMIC_ID_BOUNDARY = @DYNAMIC_ID_BOUNDARY@ }; diff --git a/cmake/gmock.pc.in b/cmake/gmock.pc.in new file mode 100644 index 0000000..76d5c0c --- /dev/null +++ b/cmake/gmock.pc.in @@ -0,0 +1,9 @@ +Name: libgmock +Version: 1.6.0 +Description: Google's framework for writing C++ tests on a variety of platforms + +prefix=@CMAKE_INSTALL_PREFIX@ +includedir=${prefix}/include +libdir=${prefix}/lib +Cflags:-I${includedir}/gmock +Libs: -L${libdir} -lgmock diff --git a/cmake/gtest.pc.in b/cmake/gtest.pc.in new file mode 100644 index 0000000..37b8209 --- /dev/null +++ b/cmake/gtest.pc.in @@ -0,0 +1,9 @@ +Name: libgtest +Version: 1.6.0 +Description: Google's framework for writing C++ tests on a variety of platforms + +prefix=@CMAKE_INSTALL_PREFIX@ +includedir=${prefix}/include +libdir=${prefix}/lib +Cflags:-I${includedir}/gtest +Libs: -L${libdir} -lgtest |