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 --- PluginControlInterface/test/CAmControlReceiverShadowTest.h | 2 +- PluginControlInterface/test/CMakeLists.txt | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'PluginControlInterface') diff --git a/PluginControlInterface/test/CAmControlReceiverShadowTest.h b/PluginControlInterface/test/CAmControlReceiverShadowTest.h index 3d112be..a544c39 100644 --- a/PluginControlInterface/test/CAmControlReceiverShadowTest.h +++ b/PluginControlInterface/test/CAmControlReceiverShadowTest.h @@ -19,7 +19,7 @@ #define CAMCONTROLRECEIVERSHADOWTEST_H_ #include "gtest/gtest.h" -#include +#include "gmock/gmock.h" #include "MockIAmControlReceive.h" #include "shared/CAmSocketHandler.h" #include "shared/CAmSerializer.h" diff --git a/PluginControlInterface/test/CMakeLists.txt b/PluginControlInterface/test/CMakeLists.txt index 5209078..37de565 100644 --- a/PluginControlInterface/test/CMakeLists.txt +++ b/PluginControlInterface/test/CMakeLists.txt @@ -22,7 +22,7 @@ set(EXECUTABLE_OUTPUT_PATH ${TEST_EXECUTABLE_OUTPUT_PATH}) FIND_PACKAGE (Threads) FIND_PACKAGE(PkgConfig) -FIND_PACKAGE(GMock REQUIRED) + IF(WITH_DLT) pkg_check_modules(DLT REQUIRED automotive-dlt>=2.2.0) @@ -62,11 +62,11 @@ TARGET_LINK_LIBRARIES(AmControlReceiverShadowTest ${DBUS_LIBRARY} ${SQLITE_LIBRARIES} gtest - ${GMOCK_LIBRARY} + gmock rt ) -ADD_DEPENDENCIES(AmControlReceiverShadowTest gtest) +ADD_DEPENDENCIES(AmControlReceiverShadowTest gtest gmock) INSTALL(TARGETS AmControlReceiverShadowTest DESTINATION "~/AudioManagerTest/" @@ -74,6 +74,6 @@ INSTALL(TARGETS AmControlReceiverShadowTest COMPONENT tests ) -SET(ADD_DEPEND "audiomanager-bin" "dlt" "libdbus-1-3(>=1.2.16)" "google-mock" "libpthread-stubs0") +SET(ADD_DEPEND "audiomanager-bin" "dlt" "libdbus-1-3(>=1.2.16)" "libpthread-stubs0") set_property(GLOBAL APPEND PROPERTY tests_prop "${ADD_DEPEND}") -- cgit v1.2.1