From beec2584c3bff46ae7aa0bf57389fb6dadf33917 Mon Sep 17 00:00:00 2001
From: christian linke <christian.linke@bmw.de>
Date: Thu, 4 Oct 2012 16:25:51 +0200
Subject: * adding GoogleMock including GoogleTest into the project

Signed-off-by: christian linke <christian.linke@bmw.de>
---
 .../test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.h         | 2 +-
 AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt     | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'AudioManagerDaemon/test/AmRoutingInterfaceTest')

diff --git a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.h b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.h
index c8c2180..982c9f2 100644
--- a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.h
+++ b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.h
@@ -22,7 +22,7 @@
 #define ROUTINGINTERFACETEST_H_
 
 #include "gtest/gtest.h"
-#include <gmock/gmock.h>
+#include "gmock/gmock.h"
 #include <algorithm>
 #include <string>
 #include <vector>
diff --git a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt
index 045aee1..5b903b5 100644
--- a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt
+++ b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt
@@ -22,7 +22,7 @@ PROJECT(AmRoutingInterfaceTest)
 #set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic")
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUNIT_TEST=1 -DDLT_CONTEXT=AudioManager")
 
-FIND_PACKAGE(GMock REQUIRED)
+
 FIND_PACKAGE(PkgConfig)
 pkg_check_modules(SQLITE REQUIRED sqlite3)
 
@@ -68,10 +68,10 @@ TARGET_LINK_LIBRARIES(AmRoutingInterfaceTest
     ${DBUS_LIBRARY}
     ${CMAKE_THREAD_LIBS_INIT}
     gtest
-    ${GMOCK_LIBRARY}
+    gmock
 )
 
-ADD_DEPENDENCIES(AmRoutingInterfaceTest gtest)
+ADD_DEPENDENCIES(AmRoutingInterfaceTest gtest gmock)
 
 INSTALL(TARGETS AmRoutingInterfaceTest 
         DESTINATION "~/AudioManagerTest/"
@@ -79,7 +79,7 @@ INSTALL(TARGETS AmRoutingInterfaceTest
         COMPONENT tests
 )
 
-SET(ADD_DEPEND "audiomanager-bin" "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)" "google-mock" "libpthread-stubs0")
+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}")
 
 
-- 
cgit v1.2.1