diff options
| author | christian linke <christian.linke@bmw.de> | 2012-10-04 16:25:51 +0200 |
|---|---|---|
| committer | christian linke <christian.linke@bmw.de> | 2012-10-04 16:25:51 +0200 |
| commit | beec2584c3bff46ae7aa0bf57389fb6dadf33917 (patch) | |
| tree | 735070d1d73cd80b2624372d6cf5fc036a16d713 /AudioManagerDaemon/test/AmDatabaseHandlerTest | |
| parent | fee37213648f86ca4fd13ed063182e2ce877aacf (diff) | |
| download | audiomanager-beec2584c3bff46ae7aa0bf57389fb6dadf33917.tar.gz | |
* adding GoogleMock including GoogleTest into the project
Signed-off-by: christian linke <christian.linke@bmw.de>
Diffstat (limited to 'AudioManagerDaemon/test/AmDatabaseHandlerTest')
| -rw-r--r-- | AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.h | 2 | ||||
| -rw-r--r-- | AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.h b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.h index bef4be5..25d63a3 100644 --- a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.h +++ b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.h @@ -24,7 +24,7 @@ #define UNIT_TEST 1 #include "gtest/gtest.h" -#include <gmock/gmock.h> +#include "gmock/gmock.h" #include "CAmDatabaseHandler.h" #include "CAmControlReceiver.h" diff --git a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt index 3dc374f..184a50d 100644 --- a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt @@ -21,7 +21,7 @@ PROJECT(AmDatabaseHandlerTest) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DUNIT_TEST=1 -DDLT_CONTEXT=AudioManager") -FIND_PACKAGE(GMock REQUIRED) + FIND_PACKAGE(PkgConfig) pkg_check_modules(SQLITE REQUIRED sqlite3) @@ -67,10 +67,10 @@ TARGET_LINK_LIBRARIES( AmDatabaseHandlerTest ${DBUS_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} gtest - ${GMOCK_LIBRARY} + gmock ) -ADD_DEPENDENCIES(AmDatabaseHandlerTest gtest) +ADD_DEPENDENCIES(AmDatabaseHandlerTest gtest gmock) INSTALL(TARGETS AmDatabaseHandlerTest DESTINATION "~/AudioManagerTest/" @@ -78,6 +78,6 @@ INSTALL(TARGETS AmDatabaseHandlerTest 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}") |