* corrected registerDomain
[profile/ivi/genivi/genivi-audio-manager.git] / CMakeLists.txt
old mode 100644 (file)
new mode 100755 (executable)
index f7702eb..be807be
@@ -1,39 +1,39 @@
-#GENIVI AUDIOMANAGER
+# Copyright (C) 2012, BMW AG
 #
-#Copyright (C) 2011, BMW AG
+# This file is part of GENIVI Project AudioManager.
+# 
+# Contributions are licensed to the GENIVI Alliance under one or more
+# Contribution License Agreements.
+# 
+# copyright
+# This Source Code Form is subject to the terms of the
+# Mozilla Public License, v. 2.0. If a  copy of the MPL was not distributed with
+# this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# 
+# author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012
 #
-#Datum  20.2.2012
-#author Christian Mueller (christian.ei.mueller@bmw.de)
-#
-#***********************************************************************************************************
-#LICENSE
-#***********************************************************************************************************
-#
-#GNU Lesser General Public License, version 2.1, with special exception (GENIVI clause)
-#Copyright (C) 2011, BMW AG – Christian Mueller  Christian.ei.mueller@bmw.de
-#
-#This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation.
-#This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License, version 2.1, for more details.
-#You should have received a copy of the GNU Lesser General Public License, version 2.1, along with this program; if not, see <http://www.gnu.org/licenses/lgpl-2.1.html>.
-#Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may also be applicable to programs even in cases in which the program is not a library in the technical sense.
-#Linking AudioManager statically or dynamically with other modules is making a combined work based on AudioManager. You may license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to license your linked modules under the GNU Lesser General Public License, version 2.1, you may use the program under the following exception.
-#As a special exception, the copyright holders of AudioManager give you permission to combine AudioManager with software programs or libraries that are released under any license unless such a combination is not permitted by the license of such a software program or library. You may copy and distribute such a system following the terms of the GNU Lesser General Public License, version 2.1, including this special exception, for AudioManager and the licenses of the other code concerned.
-#Note that people who make modified versions of AudioManager are not obligated to grant this special exception for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, version 2.1, gives permission to release a modified version without this exception; this exception also makes it possible to release a modified version which carries forward this exception.
+# For further information see http://www.genivi.org/.
 #
 
 
 cmake_minimum_required(VERSION 2.6)
+include(CMakeDependentOption)
 
 execute_process(COMMAND git describe --tags WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} 
                 OUTPUT_VARIABLE DAEMONVERSION 
                 OUTPUT_STRIP_TRAILING_WHITESPACE)           
 
-IF (DAEMON_ERROR)
-       SET( DAEMONVERSION "homebrew-${CMAKE_SOURCE_DIR}" )
-ELSE (DAEMON_ERROR)
+IF (NOT DAEMONVERSION)
+    #Can be changed via passing -DVERSION="XXX" to cmake
+    IF(NOT DEFINED VERSION)
+        SET( DAEMONVERSION "homebrew-${CMAKE_SOURCE_DIR}" )
+    ELSE (NOT DEFINED VERSION)
+        SET( DAEMONVERSION "${VERSION}" )   
+    ENDIF(NOT DEFINED VERSION)
+ELSE (NOT DAEMONVERSION)
     STRING(REGEX REPLACE "(-)[^-]+$" "" DAEMONVERSION ${DAEMONVERSION})
     STRING(REGEX REPLACE "-" "." DAEMONVERSION ${DAEMONVERSION})
-ENDIF(DAEMON_ERROR)
+ENDIF(NOT DAEMONVERSION)
 
 message(STATUS "Build Version ${DAEMONVERSION}")
 
@@ -42,14 +42,14 @@ execute_process(COMMAND git log --pretty=short WORKING_DIRECTORY ${CMAKE_CURRENT
 
 PROJECT(AudioManagerDeamon)
 
-OPTION( WITH_DBUS_WRAPPER 
-       "Enable Dbus Wrapper Support" ON )
+FIND_PACKAGE(PkgConfig)
+
+SET(WITH_ENABLED_IPC "CAPI" CACHE STRING "Disable 'NONE' / Enable Common-API 'CAPI' or Dbus 'DBUS' Support")
 
-OPTION( WITH_SOCKETHANDLER_LOOP 
-       "Enable SocketHandler Support (cannot work with SimpleDBusLoop)" ON )
+SET_PROPERTY(CACHE WITH_ENABLED_IPC PROPERTY STRINGS "NONE" "CAPI" "DBUS") 
 
-OPTION( WITH_SIMPLEDBUS_LOOP 
-       "Enable SimpleDBusLoop (requires DBus_Wrapper,cannot work with SocketHandler)" OFF )
+OPTION( WITH_DLT 
+    "Enable automotive-DLT Support" ON )
 
 OPTION( WITH_TESTS
        "Build together with all available unitTest" ON )
@@ -61,29 +61,75 @@ OPTION( WITH_PLUGIN_COMMAND
        "Build command pluings" ON)
 
 OPTION( WITH_PLUGIN_CONTROL
-       "Build control pluing" ON)
+       "Build control plugin" ON)
 
 OPTION( WITH_PLUGIN_ROUTING
        "Build routing pluings" ON)
 
-OPTION( WITH_MAIN
-       "Build with daemon" ON)
-
-OPTION( WITH_PPOLL
-       "libc supports ppoll" ON)
-
 OPTION( WITH_TELNET
        "build with Telnetserver (can only work with SocketHandler)" ON)
        
+OPTION ( WITH_SYSTEMD_WATCHDOG
+    "build with systemD support & watchdog" OFF)
+       
 OPTION ( USE_BUILD_LIBS
        "build with default library path = build path" ON)
        
 OPTION ( GLIB_DBUS_TYPES_TOLERANT
     "build dbus with tolerance towards glib 16bit/32bit handling" ON)
 
+IF (WITH_ENABLED_IPC STREQUAL "NONE")
+   SET (ENABLE_NSM OFF)
+ELSE  ()
+   SET (ENABLE_NSM ON)
+ENDIF ()
+
+CMAKE_DEPENDENT_OPTION(WITH_NSM "build with NSM support" ON
+                        "ENABLE_NSM" OFF)
+
+OPTION ( WITH_NSM
+    "build with NSM support" ON)
+  
+ OPTION ( WITH_DATABASE_STORAGE
+    "build with sqlite as in memory storage" OFF)
+IF (WITH_ENABLED_IPC STREQUAL "DBUS")
+    SET (WITH_DBUS_WRAPPER ON CACHE INTERNAL "hide this!" FORCE)
+    SET (WITH_CAPI_WRAPPER OFF CACHE INTERNAL "hide this!" FORCE)
+ELSEIF(WITH_ENABLED_IPC STREQUAL "CAPI")
+    SET (WITH_CAPI_WRAPPER ON CACHE INTERNAL "hide this!" FORCE)
+    SET (WITH_DBUS_WRAPPER OFF CACHE INTERNAL "hide this!" FORCE)
+    
+    MACRO(INSERT_DBUS_CONF_IF_NEEDED IN_PLACEHOLDER IN_SRC_DBUS_CONF OUT_DST_DBUS_CONF)
+        # Checks the variable in the template
+        if(NOT EXISTS ${CMAKE_SOURCE_DIR}/AudioManagerDaemon/fidls/AudioManager_dbus.conf.in )
+            FILE(WRITE ${CMAKE_SOURCE_DIR}/AudioManagerDaemon/fidls/AudioManager_dbus.conf.in 
+                       "################################################ CMAKE GENERATED #################################################")
+        endif( )
+        
+        FILE(READ ${CMAKE_SOURCE_DIR}/AudioManagerDaemon/fidls/AudioManager_dbus.conf.in DBUS_CONF_IN)
+        if( NOT DBUS_CONF_IN MATCHES ${IN_PLACEHOLDER} )
+            if( NOT DBUS_CONF_IN STREQUAL "" )
+                FILE(APPEND ${CMAKE_SOURCE_DIR}/AudioManagerDaemon/fidls/AudioManager_dbus.conf.in "\r\n\r\n")
+            endif( )   
+            FILE(APPEND ${CMAKE_SOURCE_DIR}/AudioManagerDaemon/fidls/AudioManager_dbus.conf.in ${IN_PLACEHOLDER})
+        endif( )
+        # Reads out the common-api dbus configuration for the node state manager.
+        FILE(READ ${IN_SRC_DBUS_CONF} ${OUT_DST_DBUS_CONF})
+    ENDMACRO(INSERT_DBUS_CONF_IF_NEEDED) 
+    
+ ELSEIF(WITH_ENABLED_IPC STREQUAL "NONE")   
+    SET (WITH_CAPI_WRAPPER OFF CACHE INTERNAL "hide this!" FORCE)
+    SET (WITH_DBUS_WRAPPER OFF CACHE INTERNAL "hide this!" FORCE)
+ENDIF ()
+    
+IF (NOT WITH_DBUS_WRAPPER AND NOT WITH_CAPI_WRAPPER)
+    SET (WITH_NSM OFF)
+ENDIF (NOT WITH_DBUS_WRAPPER AND NOT WITH_CAPI_WRAPPER)
 #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" )
+       SET( DBUS_SERVICE_PREFIX "org.genivi.audiomanager\0")
 ENDIF(NOT DEFINED DBUS_SERVICE_PREFIX)
 
 #Can be changed via passing -DDBUS_SERVICE_OBJECT_PATH="XXX" to cmake
@@ -93,7 +139,7 @@ ENDIF(NOT DEFINED DBUS_SERVICE_OBJECT_PATH)
 
 #Can be changed via passing -DDEFAULT_TELNETPORT="XXX" to cmake
 IF(NOT DEFINED DEFAULT_TELNETPORT)
-       SET( DEFAULT_TELNETPORT 6060 )
+       SET( DEFAULT_TELNETPORT 6080 )
 ENDIF(NOT DEFINED DEFAULT_TELNETPORT)
 
 #Can be changed via passing -DMAX_TELNETCONNECTIONS="XXX" to cmake
@@ -101,35 +147,74 @@ IF(NOT DEFINED MAX_TELNETCONNECTIONS)
        SET( MAX_TELNETCONNECTIONS 3 )
 ENDIF(NOT DEFINED MAX_TELNETCONNECTIONS)
 
+#Can be changed via passing -DNSM_BUS_INTERFACE="XXX" to cmake
+IF(NOT DEFINED NSM_BUS_INTERFACE)
+       SET( NSM_BUS_INTERFACE "org.genivi.NodeStateManager")
+ENDIF(NOT DEFINED NSM_BUS_INTERFACE)
+
+#Can be changed via passing -DNSM_PATH="XXX" to cmake
+IF(NOT DEFINED NSM_PATH)
+       SET( NSM_PATH "/org/genivi/NodeStateManager")
+ENDIF(NOT DEFINED NSM_PATH)
+
+#Can be changed via passing -DNSM_INTERFACE="XXX" to cmake
+IF(NOT DEFINED NSM_INTERFACE)
+       SET( NSM_INTERFACE "org.genivi.NodeStateManager.Consumer")
+ENDIF(NOT DEFINED NSM_INTERFACE)
+
 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/")
+    SET(PROJECT_INCLUDE_FOLDER ${CMAKE_SOURCE_DIR}/ProjectSpecific/include)
+endif(EXISTS "ProjectSpecific/")
+
 SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
-SET(AUDIO_INCLUDES_FOLDER ${CMAKE_SOURCE_DIR}/includes)
+SET(AUDIO_INCLUDE_FOLDER ${CMAKE_SOURCE_DIR}/include)
 SET(DOC_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/doc)
 SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/bin)
 SET(TEST_EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/bin/test)
-SET(DOXY_FILE ${CMAKE_SOURCE_DIR}/cmake/DoxyFile.in)
-SET(INTROSPECTION_COMMAND_XML_FILE "${AUDIO_INCLUDES_FOLDER}/dbus/CommandInterface.xml")
+SET(DOXY_PROTOTYPE ${CMAKE_SOURCE_DIR}/cmake/DoxyFile.in)
+SET(DOXY_FILE ${CMAKE_CURRENT_BINARY_DIR}/DoxyFile)
 
-CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/cmake/config.cmake ${CMAKE_SOURCE_DIR}/includes/config.h )
+CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/AudioManagerDaemon/docx/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/DoxyFile )
 
-FIND_PACKAGE(PkgConfig)
-pkg_check_modules(DLT REQUIRED automotive-dlt)
+IF(WITH_DLT)    
+    pkg_check_modules(DLT REQUIRED automotive-dlt>=2.2.0)   
+ENDIF(WITH_DLT)
+
+IF(WITH_TESTS) 
+       add_subdirectory(googleMock)
+       set(GMOCK_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/googleMock/include")
+       set(GOOGLE_TEST_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/googleMock/gtest/include")
+ENDIF(WITH_TESTS)
 
 IF(WITH_DOCUMENTATION)
        find_package(Doxygen)
        configure_file(${DOXY_FILE}  ${DOC_OUTPUT_PATH}/Doxyfile  @ONLY IMMEDIATE)
+       configure_file("README.html" ${DOC_OUTPUT_PATH}/html/README.html)
        add_custom_target (AudioManangerDoku ALL 
                COMMAND ${DOXYGEN_EXECUTABLE} ${DOC_OUTPUT_PATH}/Doxyfile WORKING_DIRECTORY ${DOC_OUTPUT_PATH}
                SOURCES ${CMAKE_SOURCE_DIR} ${DOC_OUTPUT_PATH}/Doxyfile
@@ -137,25 +222,35 @@ IF(WITH_DOCUMENTATION)
 ENDIF(WITH_DOCUMENTATION)
 
 ##global build flags set(CPACK_RPM_COMPONENT_INSTALL ON)
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -Wextra -std=c++98 -D_GNU_SOURCE -pedantic -Wno-variadic-macros")
+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -Wextra -std=gnu++0x -D_GNU_SOURCE -pedantic -Wno-variadic-macros -Wno-long-long")
 #set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -Wextra -std=c++98 -D_GNU_SOURCE")
 
 if(WITH_PLUGIN_COMMAND)
-       add_subdirectory (PluginCommandInterfaceDbus)
+    if(WITH_DBUS_WRAPPER)
+           add_subdirectory (PluginCommandInterfaceDbus)
+    elseif(WITH_CAPI_WRAPPER)              
+           add_subdirectory (PluginCommandInterfaceCAPI)
+    endif()    
 endif(WITH_PLUGIN_COMMAND)
 
 if(WITH_PLUGIN_ROUTING)
-       add_subdirectory (PluginRoutingInterfaceDbus)
        add_subdirectory (PluginRoutingInterfaceAsync)
+    if(WITH_DBUS_WRAPPER)
+           add_subdirectory (PluginRoutingInterfaceDbus)
+       elseif(WITH_CAPI_WRAPPER)           
+       add_subdirectory (PluginRoutingInterfaceCAPI)    
+       endif()    
 endif(WITH_PLUGIN_ROUTING)
 
 if(WITH_PLUGIN_CONTROL)
        add_subdirectory (PluginControlInterface)
 endif(WITH_PLUGIN_CONTROL)
 
-if(WITH_MAIN)
-       add_subdirectory (AudioManagerDaemon)
-endif(WITH_MAIN)
+add_subdirectory (AudioManagerDaemon)
+
+IF(EXISTS "${CMAKE_SOURCE_DIR}/ProjectSpecific/")
+    add_subdirectory (ProjectSpecific)
+endif(EXISTS "${CMAKE_SOURCE_DIR}/ProjectSpecific/")
 
 # uninstall target
 configure_file(
@@ -176,14 +271,24 @@ SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "AudioManager: This component manages audi
 SET(CPACK_PACKAGE_VERSION "${DAEMONVERSION}")
 SET(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/LICENCE)
 SET(CPACK_RESOURCE_FILE_README ${CMAKE_SOURCE_DIR}/README)
-SET(CPACK_PACKAGE_CONTACT "Christian Mueller (BMW) christian.ei.mueller@bmw.de")
+SET(CPACK_PACKAGE_CONTACT "Christian Linke(BMW) christian.linke@bmw.de")
 SET(CPACK_PACKAGE_INSTALL_DIRECTORY "genivi")
 SET(CPACK_DEBIAN_ARCHITECTURE ${CMAKE_SYSTEM_PROCESSOR})
 SET(CPACK_DEBIAN_PACKAGE_DEPENDS "*")
 SET(CPACK_STRIP_FILES TRUE)
 SET(CPACK_PACKAGE_DESCRIPTION_FILE ${CMAKE_SOURCE_DIR}/README)
 SET(CPACK_SOURCE_GENERATOR "TGZ")
-SET(CPACK_SOURCE_IGNORE_FILES ".settings*" ".cproject" ".project" "/\\\\.metadata" "\\\\.#" "/#" ".*~" "/\\\\.git" "${CMAKE_CURRENT_BINARY_DIR}" "bin/" "packages/" "config.h") 
+SET(CPACK_SOURCE_IGNORE_FILES ".settings*" ".cproject" "/\\\\.metadata" "\\\\.#" "/#" ".*~" "/\\\\.git" "${CMAKE_CURRENT_BINARY_DIR}" "bin/" "packages/" "config.h") 
+
+IF(WITH_TESTS)
+       get_property(ADD_DEPEND GLOBAL PROPERTY tests_prop)
+       list(REMOVE_DUPLICATES ADD_DEPEND)
+       list(APPEND ALL_DEPEND ${ADD_DEPEND})
+       FOREACH (dep ${ADD_DEPEND})     
+               SET(tests_DEPENDENCIES "${dep} ,${tests_DEPENDENCIES}")
+       ENDFOREACH(dep)
+       STRING(REGEX REPLACE ".$" "" tests_DEPENDENCIES ${tests_DEPENDENCIES})
+ENDIF(WITH_TESTS)
 
 #evaluate the properties
 if(WITH_MAIN)
@@ -196,6 +301,7 @@ ENDFOREACH(dep)
 STRING(REGEX REPLACE ".$" "" bin_DEPENDENCIES ${bin_DEPENDENCIES})
 endif(WITH_MAIN)
 
+if(WITH_PLUGIN_COMMAND OR WITH_PLUGIN_CONTROL OR WITH_PLUGIN_ROUTING)
 get_property(ADD_DEPEND GLOBAL PROPERTY sampleplugins_prop)
 list(REMOVE_DUPLICATES ADD_DEPEND)
 list(APPEND ALL_DEPEND ${ADD_DEPEND})
@@ -203,16 +309,7 @@ FOREACH (dep ${ADD_DEPEND})
        SET(sampleplugins_DEPENDENCIES "${dep} ,${sampleplugins_DEPENDENCIES}")
 ENDFOREACH(dep)
 STRING(REGEX REPLACE ".$" "" sampleplugins_DEPENDENCIES ${sampleplugins_DEPENDENCIES})
-
-if(WITH_TESTS)
-get_property(ADD_DEPEND GLOBAL PROPERTY tests_prop)
-list(REMOVE_DUPLICATES ADD_DEPEND)
-list(APPEND ALL_DEPEND ${ADD_DEPEND})
-FOREACH (dep ${ADD_DEPEND})    
-       SET(tests_DEPENDENCIES "${dep} ,${tests_DEPENDENCIES}")
-ENDFOREACH(dep)
-STRING(REGEX REPLACE ".$" "" tests_DEPENDENCIES ${tests_DEPENDENCIES})
-endif(WITH_TESTS)
+endif(WITH_PLUGIN_COMMAND OR WITH_PLUGIN_CONTROL OR WITH_PLUGIN_ROUTING)
 
 get_property(ADD_DEPEND GLOBAL PROPERTY dev_prop)
 list(REMOVE_DUPLICATES ADD_DEPEND)
@@ -231,36 +328,36 @@ STRING(REGEX REPLACE ".$" "" all_DEPENDENCIES ${all_DEPENDENCIES})
 execute_process(COMMAND cp ${CMAKE_MODULE_PATH}/add_package_dependencies.sh ${CMAKE_CURRENT_BINARY_DIR})
 
 #component based dep package generation is only supported above 2.8.5
-IF (${CMAKE_VERSION} VERSION_GREATER 2.9.4)
+IF (${CMAKE_VERSION} VERSION_GREATER 2.8.5)
 
        SET(CPACK_COMPONENTS_ALL bin sampleplugins tests dev)
        SET(CPACK_COMPONENTS_IGNORE_GROUPS 1)
        SET(CPACK_DEB_COMPONENT_INSTALL ON)
        ADD_CUSTOM_TARGET(genivi_package 
-               COMMAND ${CMAKE_COMMAND} ${CMAKE_BINARY_DIR} -DUSE_BUILD_LIBS=ON
+               COMMAND ${CMAKE_COMMAND} ${CMAKE_BINARY_DIR} -DUSE_BUILD_LIBS=OFF
                COMMAND make package
                COMMAND ${CMAKE_CURRENT_BINARY_DIR}/add_package_dependencies.sh ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-Linux-bin.deb ${CPACK_OUTPUT_FILE_PREFIX} \"${bin_DEPENDENCIES}\"
                COMMAND ${CMAKE_CURRENT_BINARY_DIR}/add_package_dependencies.sh ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-Linux-sampleplugins.deb ${CPACK_OUTPUT_FILE_PREFIX} \"${sampleplugins_DEPENDENCIES}\"
                COMMAND ${CMAKE_CURRENT_BINARY_DIR}/add_package_dependencies.sh ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-Linux-tests.deb ${CPACK_OUTPUT_FILE_PREFIX} \"${tests_DEPENDENCIES}\"
                COMMAND ${CMAKE_CURRENT_BINARY_DIR}/add_package_dependencies.sh ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-Linux-dev.deb ${CPACK_OUTPUT_FILE_PREFIX} \"${dev_DEPENDENCIES}\"
        ) 
-ELSE (${CMAKE_VERSION} VERSION_GREATER 2.9.4)
+ELSE (${CMAKE_VERSION} VERSION_GREATER 2.8.5)
        IF(${CMAKE_VERSION} VERSION_GREATER 2.8.3)
                ADD_CUSTOM_TARGET(genivi_package 
-                       COMMAND ${CMAKE_COMMAND} ${CMAKE_BINARY_DIR} -DUSE_BUILD_LIBS=ON
+                       COMMAND ${CMAKE_COMMAND} ${CMAKE_BINARY_DIR} -DUSE_BUILD_LIBS=OFF
                        COMMAND make package
-                       COMMAND ${CMAKE_CURRENT_BINARY_DIR}/add_package_dependencies.sh ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-Linux.deb ${CPACK_OUTPUT_FILE_PREFIX} \"${all_DEPENDENCIES}\"
+                       COMMAND ${CMAKE_CURRENT_BINARY_DIR}A logical block opening on t/add_package_dependencies.sh ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-Linux.deb ${CPACK_OUTPUT_FILE_PREFIX} \"${all_DEPENDENCIES}\"
                )
        ELSE(${CMAKE_VERSION} VERSION_GREATER 2.8.3)
                ADD_CUSTOM_TARGET(genivi_package 
-                       COMMAND ${CMAKE_COMMAND} ${CMAKE_BINARY_DIR} -DUSE_BUILD_LIBS=ON
+                       COMMAND ${CMAKE_COMMAND} ${CMAKE_BINARY_DIR} -DUSE_BUILD_LIBS=OFF
                        COMMAND make package
                        COMMAND mkdir -p ../${CPACK_OUTPUT_FILE_PREFIX}
                        COMMAND mv ${CMAKE_CURRENT_BINARY_DIR}/${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-Linux.deb ${CPACK_OUTPUT_FILE_PREFIX}
                        COMMAND ${CMAKE_CURRENT_BINARY_DIR}/add_package_dependencies.sh ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-Linux.deb ${CPACK_OUTPUT_FILE_PREFIX} \"${all_DEPENDENCIES}\"
                )
        ENDIF(${CMAKE_VERSION} VERSION_GREATER 2.8.3)
-ENDIF (${CMAKE_VERSION} VERSION_GREATER 2.9.4)
+ENDIF (${CMAKE_VERSION} VERSION_GREATER 2.8.5)
 
 INCLUDE(CPack)