diff options
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/AudioManagerConfig.cmake.in | 1 | ||||
| -rw-r--r-- | cmake/AudioManagerUtilitiesConfig.cmake.in | 3 | ||||
| -rw-r--r-- | cmake/MacroVersionFromGit.cmake | 35 | ||||
| -rw-r--r-- | cmake/audiomanagercore.pc.in | 2 | ||||
| -rw-r--r-- | cmake/audiomanagerutilities.pc.in | 2 | ||||
| -rw-r--r-- | cmake/config.cmake.in | 7 |
6 files changed, 41 insertions, 9 deletions
diff --git a/cmake/AudioManagerConfig.cmake.in b/cmake/AudioManagerConfig.cmake.in index 1c93dd8..33c1eb7 100644 --- a/cmake/AudioManagerConfig.cmake.in +++ b/cmake/AudioManagerConfig.cmake.in @@ -10,6 +10,7 @@ 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_DIR "@DEFAULT_PLUGIN_DIR@") 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@") diff --git a/cmake/AudioManagerUtilitiesConfig.cmake.in b/cmake/AudioManagerUtilitiesConfig.cmake.in index b13fac4..acca825 100644 --- a/cmake/AudioManagerUtilitiesConfig.cmake.in +++ b/cmake/AudioManagerUtilitiesConfig.cmake.in @@ -39,11 +39,12 @@ if(WITH_DLT) SET(AUDIOMANAGER_UTILITIES_EXTERNAL_INCLUDE ${AUDIOMANAGER_UTILITIES_EXTERNAL_INCLUDE} - ${DLT_LIBRARY_DIRS}) + ${DLT_INCLUDE_DIRS}) endif(WITH_DLT) set(AudioManagerUtilities_INCLUDE_DIRS ${AudioManagerUtilities_INCLUDE_DIRS} ${AUDIOMANAGER_UTILITIES_EXTERNAL_INCLUDE}) set(AudioManagerUtilities_LIBRARIES @AUDIO_MANAGER_UTILITIES_LIBS@ ${AudioManagerUtilities_LIBRARY}) +set(AudioManagerUtilities_LIB_DIRECTORIES @AUDIOMANAGER_UTILITIES_LIB_DIRECTORIES@) set(DAEMONVERSION "@DAEMONVERSION@") set(AUDIOMANAGER_CMAKE_CXX_FLAGS "@AUDIOMANAGER_CMAKE_CXX_FLAGS@") set(WITH_SHARED_UTILITIES "@WITH_SHARED_UTILITIES@") diff --git a/cmake/MacroVersionFromGit.cmake b/cmake/MacroVersionFromGit.cmake index d146754..40c56e7 100644 --- a/cmake/MacroVersionFromGit.cmake +++ b/cmake/MacroVersionFromGit.cmake @@ -1,7 +1,36 @@ # get the current git version -execute_process(COMMAND git describe --tags WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - OUTPUT_VARIABLE DAEMONVERSION - OUTPUT_STRIP_TRAILING_WHITESPACE) +execute_process(COMMAND git tag + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + OUTPUT_VARIABLE TAG_LIST + OUTPUT_STRIP_TRAILING_WHITESPACE) + +IF(TAG_LIST) + + STRING (REPLACE "\n" ";" TAG_LIST ${TAG_LIST}) + + set (VERSION_LIST) + + foreach (element ${TAG_LIST}) + STRING (REGEX MATCH "^[0-9]+\\.." SINGLE_VERSION ${element}) + LIST (APPEND VERSION_LIST ${SINGLE_VERSION}) + endforeach (element) + + LIST (REVERSE VERSION_LIST) + + LIST (GET VERSION_LIST 0 VERSION_MISSING_MINOR) + + execute_process(COMMAND git --no-pager log --pretty=oneline HEAD...${VERSION_MISSING_MINOR} + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + OUTPUT_VARIABLE COMMIT_LIST + OUTPUT_STRIP_TRAILING_WHITESPACE) + + STRING (REPLACE "\n" ";" COMMIT_LIST ${COMMIT_LIST}) + + LIST (LENGTH COMMIT_LIST MINOR_VERSION) + + SET (DAEMONVERSION "${VERSION_MISSING_MINOR}.${MINOR_VERSION}") + +ENDIF(TAG_LIST) if (NOT DAEMONVERSION) #Can be changed via passing -DVERSION="XXX" to cmake diff --git a/cmake/audiomanagercore.pc.in b/cmake/audiomanagercore.pc.in index 089c042..aea84ce 100644 --- a/cmake/audiomanagercore.pc.in +++ b/cmake/audiomanagercore.pc.in @@ -4,7 +4,7 @@ includedir=@CMAKE_INSTALL_PREFIX@/include/@LIB_INSTALL_SUFFIX@/AudioManagerCore Name: Audiomanager Core Description: The Audiomanager Core Lib Version: @AudioManagerCore_VERSION_STRING@ -Requires: AudioManagerUtilities +Requires: audiomanagerutilities Libs: -L${libdir} lAudioManagerCore Cflags: -I${includedir} diff --git a/cmake/audiomanagerutilities.pc.in b/cmake/audiomanagerutilities.pc.in index 9874543..87320af 100644 --- a/cmake/audiomanagerutilities.pc.in +++ b/cmake/audiomanagerutilities.pc.in @@ -1,5 +1,5 @@ libdir=@CMAKE_INSTALL_PREFIX@/lib -includedir=@CMAKE_INSTALL_PREFIX@/include/@LIB_INSTALL_SUFFIX@/AudioMangerUtilities +includedir=@CMAKE_INSTALL_PREFIX@/include/@LIB_INSTALL_SUFFIX@/AudioManagerUtilities Name: Audiomanager Utilities Description: The Audiomanager Utilities diff --git a/cmake/config.cmake.in b/cmake/config.cmake.in index a03a79f..da64732 100644 --- a/cmake/config.cmake.in +++ b/cmake/config.cmake.in @@ -10,13 +10,11 @@ #cmakedefine GLIB_DBUS_TYPES_TOLERANT #cmakedefine WITH_SYSTEMD_WATCHDOG +#cmakedefine DEFAULT_PLUGIN_DIR "@DEFAULT_PLUGIN_DIR@" #cmakedefine DEFAULT_PLUGIN_COMMAND_DIR "@DEFAULT_PLUGIN_COMMAND_DIR@" #cmakedefine DEFAULT_PLUGIN_ROUTING_DIR "@DEFAULT_PLUGIN_ROUTING_DIR@" #cmakedefine CONTROLLER_PLUGIN_DIR "@CONTROLLER_PLUGIN_DIR@" -#cmakedefine DEFAULT_TELNETPORT @DEFAULT_TELNETPORT@ -#cmakedefine MAX_TELNETCONNECTIONS @MAX_TELNETCONNECTIONS@ - #cmakedefine DBUS_SERVICE_PREFIX "@DBUS_SERVICE_PREFIX@" #cmakedefine DBUS_SERVICE_OBJECT_PATH "@DBUS_SERVICE_OBJECT_PATH@" @@ -34,6 +32,9 @@ #cmakedefine LIB_CONTROL_INTERFACE_VERSION @LIB_CONTROL_INTERFACE_VERSION@ #cmakedefine LIB_ROUTING_INTERFACE_VERSION @LIB_ROUTING_INTERFACE_VERSION@ +#cmakedefine AUDIOMANGER_APP_ID "@AUDIOMANGER_APP_ID@" +#cmakedefine AUDIOMANGER_APP_DESCRIPTION "@AUDIOMANGER_APP_DESCRIPTION@" + enum { DYNAMIC_ID_BOUNDARY = @DYNAMIC_ID_BOUNDARY@ }; #endif /* _CONFIG_H */ |