* fully rework. Plugins have now a new own git repository

* building out of source of plugins without AM workss
* build system cmake contructions is different now

Signed-off-by: Christian Linke <christian.linke@bmw.de>

1 files changed, 68 insertions, 68 deletions

diff --git a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt
index 99dd576..85741d8 100644
--- a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt
+++ b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt
@@ -7,87 +7,87 @@
 # 
 # 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
+# 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
+# author Christian Linke, christian.linke@bmw.de BMW 2011,2012
 #
 # For further information see http://www.genivi.org/.
 #
 
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.8)
 
-PROJECT(AmDatabaseHandlerTest)
+project(AmDatabaseHandlerTest)
 
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DUNIT_TEST=1 -DDLT_CONTEXT=AudioManager")
 
+#only build this test if sqlite is requested
+if(WITH_DATABASE_STORAGE)
 
-FIND_PACKAGE(PkgConfig)
-IF(WITH_DATABASE_STORAGE)
+    set (AM_LINK_LIBS 
+        ${CMAKE_DL_LIBS}
+        rt)
+        
 	pkg_check_modules(SQLITE REQUIRED sqlite3)
 
-IF(WITH_DLT)    
-    pkg_check_modules(DLT REQUIRED automotive-dlt>=2.2.0)   
-ENDIF(WITH_DLT)
-
-INCLUDE_DIRECTORIES(   
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${AUDIO_INCLUDE_FOLDER}
-    ${DBUS_ARCH_INCLUDE_DIR}
-    ${DBUS_INCLUDE_FOLDER} 
-    ${CMAKE_SOURCE_DIR} 
-    ${STD_INCLUDE_DIRS}
-    ${DLT_INCLUDE_DIRS}
-    ${DBUS_INCLUDE_DIR}
-    ${INCLUDE_FOLDER}
-    ${GOOGLE_TEST_INCLUDE_DIR}
-    ${GMOCK_INCLUDE_DIR}
-)
-
-file(GLOB DATABASE_SRCS_CXX 
-    "../../src/CAmDatabaseHandlerSQLite.cpp"
-    "../../src/CAmDatabaseObserver.cpp"
-    "../../src/CAmCommandSender.cpp"
-    "../../src/CAmRoutingSender.cpp"
-    "../../src/CAmControlReceiver.cpp"
-    "../../src/CAmControlSender.cpp"
-    "../../src/CAmRouter.cpp"
-    "../../src/CAmDltWrapper.cpp"
-    "../../src/CAmSocketHandler.cpp"
-    "../../src/CAmCommandReceiver.cpp"
-    "../../src/CAmRoutingReceiver.cpp"
-    "../../src/CAmDbusWrapper.cpp"
-    "../CAmCommonFunctions.cpp" 
-    "*.cpp"
+    if(WITH_DLT)    
+        pkg_check_modules(DLT REQUIRED automotive-dlt>=2.2.0)  
+        set (AM_LINK_LIBS
+            ${AM_LINK_LIBS}
+            ${DLT_LIBRARIES}) 
+    endif(WITH_DLT)
+    
+    INCLUDE_DIRECTORIES(   
+        ${CMAKE_CURRENT_BINARY_DIR}
+        ${AUDIO_INCLUDE_FOLDER}
+        ${CMAKE_SOURCE_DIR} 
+        ${STD_INCLUDE_DIRS}
+        ${INCLUDE_FOLDER}
+        ${GOOGLE_TEST_INCLUDE_DIR}
+        ${GMOCK_INCLUDE_DIR}
     )
     
-IF(WITH_NSM)
-    SET (DATABASE_SRCS_CXX
-        ${DATABASE_SRCS_CXX}
-    "../../src/CAmNodeStateCommunicatorDBus.cpp")
-ENDIF(WITH_NSM)
-
-ADD_EXECUTABLE( AmDatabaseHandlerTest ${DATABASE_SRCS_CXX})
-
-TARGET_LINK_LIBRARIES( AmDatabaseHandlerTest 
-	${SQLITE_LIBRARIES}
-	${DLT_LIBRARIES}
-	${DBUS_LIBRARY}
-	${CMAKE_THREAD_LIBS_INIT}
-	${CMAKE_DL_LIBS}
-    gtest
-    gmock
-)
-
-ADD_DEPENDENCIES(AmDatabaseHandlerTest gtest gmock)
-
-INSTALL(TARGETS AmDatabaseHandlerTest 
-        DESTINATION "~/AudioManagerTest/"
-        PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ
-        COMPONENT tests
-)
-
-SET(ADD_DEPEND "audiomanager-bin" "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)"  "libpthread-stubs0")
-set_property(GLOBAL APPEND PROPERTY tests_prop "${ADD_DEPEND}")
-ENDIF(WITH_DATABASE_STORAGE)
+    if(WITH_DLT)    
+    INCLUDE_DIRECTORIES(
+        ${INCLUDE_DIRECTORIES} 
+        ${DLT_INCLUDE_DIRS})
+    endif(WITH_DLT)    
+    
+    file(GLOB DATABASE_SRCS_CXX
+        "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmDatabaseHandlerSQLite.cpp"
+        "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmDatabaseObserver.cpp"
+        "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmCommandSender.cpp"
+        "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRoutingSender.cpp"
+        "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmControlReceiver.cpp"
+        "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmControlSender.cpp"
+        "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRouter.cpp"
+        "${AUDIOMANAGER_UTILITIES_SRC}/CAmSocketHandler.cpp"
+        "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmCommandReceiver.cpp"
+        "${AUDIOMANAGER_DAEMON_FOLDER}/src/CAmRoutingReceiver.cpp"
+        "${AUDIOMANAGER_UTILITIES_SRC}/CAmDltWrapper.cpp"
+        "../CAmCommonFunctions.cpp" 
+        "*.cpp"
+        )
+        
+ 
+    ADD_EXECUTABLE( AmDatabaseHandlerTest ${DATABASE_SRCS_CXX})
+    
+    TARGET_LINK_LIBRARIES( AmDatabaseHandlerTest 
+        ${AM_LINK_LIBS}
+    	${SQLITE_LIBRARIES}
+    	${CMAKE_THREAD_LIBS_INIT}
+    	${CMAKE_DL_LIBS}
+        gtest
+        gmock
+    )
+    
+    ADD_DEPENDENCIES(AmDatabaseHandlerTest gtest gmock)
+    
+    INSTALL(TARGETS AmDatabaseHandlerTest 
+            DESTINATION ${TEST_EXECUTABLE_INSTALL_PATH}
+            PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ
+            COMPONENT tests
+    )
+    
+endif(WITH_DATABASE_STORAGE)