From a579f1ffce998ab2b90d82b9b5e27fea25678a86 Mon Sep 17 00:00:00 2001 From: christian linke Date: Tue, 2 Oct 2012 14:04:45 +0200 Subject: * make sure that cmake -DCONTROLLER_PLUGIN="......." works Signed-off-by: christian linke --- CMakeLists.txt | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 57d2ad6..cf07764 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -79,6 +79,7 @@ OPTION ( USE_BUILD_LIBS OPTION ( GLIB_DBUS_TYPES_TOLERANT "build dbus with tolerance towards glib 16bit/32bit handling" ON) + #Can be changed via passing -DDBUS_SERVICE_PREFIX="XXX" to cmake IF(NOT DEFINED DBUS_SERVICE_PREFIX) SET( DBUS_SERVICE_PREFIX "org.genivi.audiomanager\0") @@ -103,13 +104,25 @@ SET(PLUGINS_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/bin/plugins) SET(LIB_INSTALL_SUFFIX "audioManager") if(USE_BUILD_LIBS) - SET(DEFAULT_PLUGIN_COMMAND_DIR "${PLUGINS_OUTPUT_PATH}/command") - SET(DEFAULT_PLUGIN_ROUTING_DIR "${PLUGINS_OUTPUT_PATH}/routing") - SET(CONTROLLER_PLUGIN "${PLUGINS_OUTPUT_PATH}/control/libPluginControlInterface.so") + IF(NOT DEFINED DEFAULT_PLUGIN_COMMAND_DIR) + SET(DEFAULT_PLUGIN_COMMAND_DIR "${PLUGINS_OUTPUT_PATH}/command") + ENDIF(NOT DEFINED DEFAULT_PLUGIN_COMMAND_DIR) + IF(NOT DEFINED DEFAULT_PLUGIN_ROUTING_DIR) + SET(DEFAULT_PLUGIN_ROUTING_DIR "${PLUGINS_OUTPUT_PATH}/routing") + ENDIF(NOT DEFINED DEFAULT_PLUGIN_ROUTING_DIR) + IF(NOT DEFINED CONTROLLER_PLUGIN) + SET(CONTROLLER_PLUGIN "${PLUGINS_OUTPUT_PATH}/control/libPluginControlInterface.so") + ENDIF(NOT DEFINED CONTROLLER_PLUGIN) else(USE_BUILD_LIBS) - SET(DEFAULT_PLUGIN_COMMAND_DIR "${CMAKE_INSTALL_PREFIX}/lib/${LIB_INSTALL_SUFFIX}/command") - SET(DEFAULT_PLUGIN_ROUTING_DIR "${CMAKE_INSTALL_PREFIX}/lib/${LIB_INSTALL_SUFFIX}/routing") - SET(CONTROLLER_PLUGIN "${CMAKE_INSTALL_PREFIX}/lib/${LIB_INSTALL_SUFFIX}/control/libPluginControlInterface.so") + IF(NOT DEFINED DEFAULT_PLUGIN_COMMAND_DIR) + SET(DEFAULT_PLUGIN_COMMAND_DIR "${CMAKE_INSTALL_PREFIX}/lib/${LIB_INSTALL_SUFFIX}/command") + ENDIF(NOT DEFINED DEFAULT_PLUGIN_COMMAND_DIR) + IF(NOT DEFINED DEFAULT_PLUGIN_ROUTING_DIR) + SET(DEFAULT_PLUGIN_ROUTING_DIR "${CMAKE_INSTALL_PREFIX}/lib/${LIB_INSTALL_SUFFIX}/routing") + ENDIF(NOT DEFINED DEFAULT_PLUGIN_ROUTING_DIR) + IF(NOT DEFINED CONTROLLER_PLUGIN) + SET(CONTROLLER_PLUGIN "${CMAKE_INSTALL_PREFIX}/lib/${LIB_INSTALL_SUFFIX}/control/libPluginControlInterface.so") + ENDIF(NOT DEFINED CONTROLLER_PLUGIN) endif(USE_BUILD_LIBS) IF(EXISTS "ProjectSpecific/") -- cgit v1.2.1