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 --- PluginRoutingInterfaceAsync/test/CAmRoutingReceiverAsync.h | 2 +- PluginRoutingInterfaceAsync/test/CMakeLists.txt | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'PluginRoutingInterfaceAsync') diff --git a/PluginRoutingInterfaceAsync/test/CAmRoutingReceiverAsync.h b/PluginRoutingInterfaceAsync/test/CAmRoutingReceiverAsync.h index cf6d0a3..37fd5a1 100644 --- a/PluginRoutingInterfaceAsync/test/CAmRoutingReceiverAsync.h +++ b/PluginRoutingInterfaceAsync/test/CAmRoutingReceiverAsync.h @@ -19,7 +19,7 @@ #define TESTROUTINGINTERFACEASYNC_H_ #include "gtest/gtest.h" -#include +#include "gmock/gmock.h" #include "MockIAmRoutingReceive.h" #include "shared/CAmSocketHandler.h" diff --git a/PluginRoutingInterfaceAsync/test/CMakeLists.txt b/PluginRoutingInterfaceAsync/test/CMakeLists.txt index 44938d6..1097d41 100644 --- a/PluginRoutingInterfaceAsync/test/CMakeLists.txt +++ b/PluginRoutingInterfaceAsync/test/CMakeLists.txt @@ -25,7 +25,7 @@ set(GOOGLE_TEST_INCLUDE_DIR "googleTest/include") FIND_PACKAGE(Threads) FIND_PACKAGE(PkgConfig) FIND_PACKAGE(DBUS REQUIRED) -FIND_PACKAGE(GMock REQUIRED) + IF(WITH_DLT) pkg_check_modules(DLT REQUIRED automotive-dlt) @@ -71,10 +71,10 @@ TARGET_LINK_LIBRARIES(AmRoutingReceiveAsyncTest ${DBUS_LIBRARY} ${SQLITE_LIBRARIES} gtest - ${GMOCK_LIBRARY} + gmock ) -ADD_DEPENDENCIES(AmRoutingReceiveAsyncTest gtest) +ADD_DEPENDENCIES(AmRoutingReceiveAsyncTest gtest gmock) IF(WITH_DLT) TARGET_LINK_LIBRARIES(AmRoutingReceiveAsyncTest @@ -88,7 +88,7 @@ INSTALL(TARGETS AmRoutingReceiveAsyncTest 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