diff options
| author | Jens Lorenz <jlorenz@de.adit-jv.com> | 2016-11-11 16:06:53 +0100 |
|---|---|---|
| committer | Christian as GENIVI Maintainer <genivi-maint-audiomanager@genivi.org> | 2016-11-14 02:53:28 -0800 |
| commit | b0f028ed31632ae7ddd79015d9da15a4e8cdd1a2 (patch) | |
| tree | e70cef53a782847a7b2417ce240b065ff4ed1af8 | |
| parent | f010b7a8a2d27e321ed37f7d93811c06e8f3e7f3 (diff) | |
| download | audiomanager-b0f028ed31632ae7ddd79015d9da15a4e8cdd1a2.tar.gz | |
CMAKE: Adding DEFAULT_PLUGIN_DIR for building customized paths.
Signed-off-by: Jens Lorenz <jlorenz@de.adit-jv.com>
| -rwxr-xr-x | CMakeLists.txt | 11 | ||||
| -rw-r--r-- | cmake/AudioManagerConfig.cmake.in | 1 | ||||
| -rw-r--r-- | cmake/config.cmake.in | 1 |
3 files changed, 10 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5865dcd..4655a23 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -112,16 +112,20 @@ GET_COMMAND_INTERFACE_VERSION(${AUDIO_INCLUDE_FOLDER}) GET_ROUTING_INTERFACE_VERSION(${AUDIO_INCLUDE_FOLDER}) GET_CONTROL_INTERFACE_VERSION(${AUDIO_INCLUDE_FOLDER}) +if(NOT DEFINED DEFAULT_PLUGIN_DIR) + set(DEFAULT_PLUGIN_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/${LIB_INSTALL_SUFFIX}") +endif(NOT DEFINED DEFAULT_PLUGIN_DIR) if(NOT DEFINED DEFAULT_PLUGIN_COMMAND_DIR) - set(DEFAULT_PLUGIN_COMMAND_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/${LIB_INSTALL_SUFFIX}/command") + set(DEFAULT_PLUGIN_COMMAND_DIR "${DEFAULT_PLUGIN_DIR}/command") endif(NOT DEFINED DEFAULT_PLUGIN_COMMAND_DIR) if(NOT DEFINED DEFAULT_PLUGIN_ROUTING_DIR) - set(DEFAULT_PLUGIN_ROUTING_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/${LIB_INSTALL_SUFFIX}/routing") + set(DEFAULT_PLUGIN_ROUTING_DIR "${DEFAULT_PLUGIN_DIR}/routing") endif(NOT DEFINED DEFAULT_PLUGIN_ROUTING_DIR) if(NOT DEFINED CONTROLLER_PLUGIN_DIR) - set(CONTROLLER_PLUGIN_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/${LIB_INSTALL_SUFFIX}/control") + set(CONTROLLER_PLUGIN_DIR "${DEFAULT_PLUGIN_DIR}/control") endif(NOT DEFINED CONTROLLER_PLUGIN_DIR) + ##global build flags set(CPACK_RPM_COMPONENT_INSTALL ON) set (AUDIOMANAGER_CMAKE_CXX_FLAGS "-std=c++11 -pedantic -rdynamic -Wno-variadic-macros") @@ -220,6 +224,7 @@ message(STATUS "LIB_INSTALL_SUFFIX = ${LIB_INSTALL_SUFFIX}") message(STATUS "TEST_EXECUTABLE_INSTALL_PATH = ${TEST_EXECUTABLE_INSTALL_PATH}") message(STATUS "DEFAULT_PLUGIN_COMMAND_DIR = ${DEFAULT_PLUGIN_COMMAND_DIR}") message(STATUS "DEFAULT_PLUGIN_ROUTING_DIR = ${DEFAULT_PLUGIN_ROUTING_DIR}") +message(STATUS "DEFAULT_PLUGIN_DIR = ${DEFAULT_PLUGIN_DIR}") message(STATUS "CONTROLLER_PLUGIN_DIR = ${CONTROLLER_PLUGIN_DIR}") message(STATUS "AM_SHARE_FOLDER = ${AM_SHARE_FOLDER}") message(STATUS "AM_MAP_CAPACITY = ${AM_MAP_CAPACITY}") 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/config.cmake.in b/cmake/config.cmake.in index a5b2337..da64732 100644 --- a/cmake/config.cmake.in +++ b/cmake/config.cmake.in @@ -10,6 +10,7 @@ #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@" |