From beec2584c3bff46ae7aa0bf57389fb6dadf33917 Mon Sep 17 00:00:00 2001 From: christian linke Date: Thu, 4 Oct 2012 16:25:51 +0200 Subject: * adding GoogleMock including GoogleTest into the project Signed-off-by: christian linke --- .../test/AmControlInterfaceTest/CAmControlInterfaceTest.h | 2 +- AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'AudioManagerDaemon/test/AmControlInterfaceTest') diff --git a/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.h b/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.h index 5f22135..b984f80 100644 --- a/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.h +++ b/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.h @@ -22,7 +22,7 @@ #define ROUTINGINTERFACETEST_H_ #include "gtest/gtest.h" -#include +#include "gmock/gmock.h" #include "CAmDatabaseHandler.h" #include "CAmControlReceiver.h" diff --git a/AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt b/AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt index e9ae672..8d4b2e9 100644 --- a/AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt @@ -21,7 +21,6 @@ PROJECT(AmControlInterfaceTest) 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 +66,10 @@ TARGET_LINK_LIBRARIES(AmControlInterfaceTest ${DBUS_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} gtest - ${GMOCK_LIBRARY} + gmock ) -ADD_DEPENDENCIES(AmControlInterfaceTest gtest) +ADD_DEPENDENCIES(AmControlInterfaceTest gtest gmock) INSTALL(TARGETS AmControlInterfaceTest DESTINATION "~/AudioManagerTest/" @@ -78,7 +77,7 @@ INSTALL(TARGETS AmControlInterfaceTest 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