From 670fb5bcc1f1e10644803af130cb2511a46cb7c9 Mon Sep 17 00:00:00 2001 From: christian linke Date: Thu, 27 Sep 2012 10:47:37 +0200 Subject: * include google test into source tree Signed-off-by: christian linke --- .../test/AmControlInterfaceTest/CMakeLists.txt | 12 ++++++++---- .../test/AmDatabaseHandlerTest/CMakeLists.txt | 11 ++++++++--- AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt | 11 ++++++++--- .../test/AmRoutingInterfaceTest/CMakeLists.txt | 11 ++++++++--- AudioManagerDaemon/test/AmSocketHandlerTest/CMakeLists.txt | 10 +++++++--- AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt | 13 ++++++++----- AudioManagerDaemon/test/CMakeLists.txt | 1 - 7 files changed, 47 insertions(+), 22 deletions(-) (limited to 'AudioManagerDaemon/test') diff --git a/AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt b/AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt index 213ccb1..e9ae672 100644 --- a/AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt @@ -21,6 +21,7 @@ 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) @@ -37,8 +38,9 @@ INCLUDE_DIRECTORIES( ${STD_INCLUDE_DIRS} ${DLT_INCLUDE_DIRS} ${DBUS_INCLUDE_DIR} - ${GTEST_INCLUDE_DIR} ${INCLUDE_FOLDER} + ${GOOGLE_TEST_INCLUDE_DIR} + ${GMOCK_INCLUDE_DIR} ) file(GLOB CONTROL_INTERFACE_SRCS_CXX @@ -64,17 +66,19 @@ TARGET_LINK_LIBRARIES(AmControlInterfaceTest ${DLT_LIBRARIES} ${DBUS_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} - ${GTEST_LIBRARIES} - gmock + gtest + ${GMOCK_LIBRARY} ) +ADD_DEPENDENCIES(AmControlInterfaceTest gtest) + INSTALL(TARGETS AmControlInterfaceTest DESTINATION "~/AudioManagerTest/" PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ COMPONENT tests ) -SET(ADD_DEPEND "audiomanager-bin" "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)" "libgtest-dev(>=1.6.0-1)" "google-mock" "libpthread-stubs0") +SET(ADD_DEPEND "audiomanager-bin" "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)" "google-mock" "libpthread-stubs0") set_property(GLOBAL APPEND PROPERTY tests_prop "${ADD_DEPEND}") diff --git a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt index 6d5b685..3dc374f 100644 --- a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt @@ -21,6 +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) @@ -38,6 +39,8 @@ INCLUDE_DIRECTORIES( ${DLT_INCLUDE_DIRS} ${DBUS_INCLUDE_DIR} ${INCLUDE_FOLDER} + ${GOOGLE_TEST_INCLUDE_DIR} + ${GMOCK_INCLUDE_DIR} ) file(GLOB DATABASE_SRCS_CXX @@ -63,16 +66,18 @@ TARGET_LINK_LIBRARIES( AmDatabaseHandlerTest ${DLT_LIBRARIES} ${DBUS_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} - ${GTEST_LIBRARIES} - gmock + gtest + ${GMOCK_LIBRARY} ) +ADD_DEPENDENCIES(AmDatabaseHandlerTest gtest) + INSTALL(TARGETS AmDatabaseHandlerTest DESTINATION "~/AudioManagerTest/" PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ COMPONENT tests ) -SET(ADD_DEPEND "audiomanager-bin" "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)" "libgtest-dev(>=1.6.0-1)" "google-mock" "libpthread-stubs0") +SET(ADD_DEPEND "audiomanager-bin" "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)" "google-mock" "libpthread-stubs0") set_property(GLOBAL APPEND PROPERTY tests_prop "${ADD_DEPEND}") diff --git a/AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt b/AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt index 906fe1a..822e5bd 100644 --- a/AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt @@ -21,6 +21,7 @@ PROJECT(AmRouterTest) 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) @@ -38,6 +39,8 @@ INCLUDE_DIRECTORIES( ${DLT_INCLUDE_DIRS} ${DBUS_INCLUDE_DIR} ${INCLUDE_FOLDER} + ${GOOGLE_TEST_INCLUDE_DIR} + ${GMOCK_INCLUDE_DIR} ) file(GLOB ROUTING_SRCS_CXX @@ -63,16 +66,18 @@ TARGET_LINK_LIBRARIES( AmRouterTest ${DLT_LIBRARIES} ${DBUS_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} - ${GTEST_LIBRARIES} - gmock + gtest + ${GMOCK_LIBRARY} ) +ADD_DEPENDENCIES(AmRouterTest gtest) + INSTALL(TARGETS AmRouterTest DESTINATION "~/AudioManagerTest/" PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ COMPONENT tests ) -SET(ADD_DEPEND "audiomanager-bin" "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)" "libgtest-dev(>=1.6.0-1)" "google-mock" "libpthread-stubs0") +SET(ADD_DEPEND "audiomanager-bin" "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)" "google-mock" "libpthread-stubs0") set_property(GLOBAL APPEND PROPERTY tests_prop "${ADD_DEPEND}") diff --git a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt index a797b67..045aee1 100644 --- a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt @@ -22,6 +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) @@ -39,6 +40,8 @@ INCLUDE_DIRECTORIES( ${DLT_INCLUDE_DIRS} ${DBUS_INCLUDE_DIR} ${INCLUDE_FOLDER} + ${GOOGLE_TEST_INCLUDE_DIR} + ${GMOCK_INCLUDE_DIR} ) file(GLOB ROUTING_INTERFACE_SRCS_CXX @@ -64,17 +67,19 @@ TARGET_LINK_LIBRARIES(AmRoutingInterfaceTest ${DLT_LIBRARIES} ${DBUS_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} - ${GTEST_LIBRARIES} - gmock + gtest + ${GMOCK_LIBRARY} ) +ADD_DEPENDENCIES(AmRoutingInterfaceTest gtest) + INSTALL(TARGETS AmRoutingInterfaceTest DESTINATION "~/AudioManagerTest/" PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ COMPONENT tests ) -SET(ADD_DEPEND "audiomanager-bin" "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)" "libgtest-dev(>=1.6.0-1)" "google-mock" "libpthread-stubs0") +SET(ADD_DEPEND "audiomanager-bin" "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)" "google-mock" "libpthread-stubs0") set_property(GLOBAL APPEND PROPERTY tests_prop "${ADD_DEPEND}") diff --git a/AudioManagerDaemon/test/AmSocketHandlerTest/CMakeLists.txt b/AudioManagerDaemon/test/AmSocketHandlerTest/CMakeLists.txt index c5edaa7..dc1df5d 100644 --- a/AudioManagerDaemon/test/AmSocketHandlerTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmSocketHandlerTest/CMakeLists.txt @@ -28,7 +28,7 @@ set(AUDIO_INCLUDE_FOLDER ${CMAKE_SOURCE_DIR}/../../../include) set(DBUS_INCLUDE_FOLDER ${CMAKE_SOURCE_DIR}/../../../../dbusinclude) set(INCLUDE_FOLDER ${CMAKE_SOURCE_DIR}/../../include) - +FIND_PACKAGE(GMock REQUIRED) FIND_PACKAGE(PkgConfig) IF(WITH_DLT) @@ -45,6 +45,8 @@ INCLUDE_DIRECTORIES( ${DLT_INCLUDE_DIRS} ${DBUS_INCLUDE_DIR} ${INCLUDE_FOLDER} + ${GOOGLE_TEST_INCLUDE_DIR} + ${GMOCK_INCLUDE_DIR} ) file(GLOB Socket_SRCS_CXX @@ -60,16 +62,18 @@ TARGET_LINK_LIBRARIES(AmSocketHandlerTest ${DBUS_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} gtest - gmock + ${GMOCK_LIBRARY} ) +ADD_DEPENDENCIES(AmSocketHandlerTest gtest) + INSTALL(TARGETS AmSocketHandlerTest DESTINATION "~/AudioManagerTest/" PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ COMPONENT tests ) -SET(ADD_DEPEND "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)" "libgtest-dev(>=1.6.0-1)" "google-mock" "libpthread-stubs0") +SET(ADD_DEPEND "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)" "google-mock" "libpthread-stubs0") set_property(GLOBAL APPEND PROPERTY tests_prop "${ADD_DEPEND}") diff --git a/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt b/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt index db69086..aa5b254 100644 --- a/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt @@ -28,7 +28,7 @@ set(AUDIO_INCLUDE_FOLDER ${CMAKE_SOURCE_DIR}/../../../include) set(DBUS_INCLUDE_FOLDER ${CMAKE_SOURCE_DIR}/../../../../dbusinclude) set(INCLUDE_FOLDER ${CMAKE_SOURCE_DIR}/../../include) - +FIND_PACKAGE(GMock REQUIRED) FIND_PACKAGE(PkgConfig) IF(WITH_DLT) @@ -44,8 +44,9 @@ INCLUDE_DIRECTORIES( ${STD_INCLUDE_DIRS} ${DLT_INCLUDE_DIRS} ${DBUS_INCLUDE_DIR} - ${GTEST_INCLUDE_DIR} ${INCLUDE_FOLDER} + ${GOOGLE_TEST_INCLUDE_DIR} + ${GMOCK_INCLUDE_DIR} ) file(GLOB TELNET_SRCS_CXX @@ -73,17 +74,19 @@ TARGET_LINK_LIBRARIES(AmTelnetServerTest ${DBUS_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_THREAD_LIBS_INIT} - ${GTEST_LIBRARIES} - gmock + gtest + ${GMOCK_LIBRARY} ) +ADD_DEPENDENCIES(AmTelnetServerTest gtest) + INSTALL(TARGETS AmTelnetServerTest DESTINATION "~/AudioManagerTest/" PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ COMPONENT tests ) -SET(ADD_DEPEND "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)" "libgtest-dev(>=1.6.0-1)" "google-mock" "libpthread-stubs0") +SET(ADD_DEPEND "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)" "google-mock" "libpthread-stubs0") set_property(GLOBAL APPEND PROPERTY tests_prop "${ADD_DEPEND}") diff --git a/AudioManagerDaemon/test/CMakeLists.txt b/AudioManagerDaemon/test/CMakeLists.txt index af9f6cd..fb93efa 100644 --- a/AudioManagerDaemon/test/CMakeLists.txt +++ b/AudioManagerDaemon/test/CMakeLists.txt @@ -19,7 +19,6 @@ cmake_minimum_required(VERSION 2.6) set(EXECUTABLE_OUTPUT_PATH ${TEST_EXECUTABLE_OUTPUT_PATH}) -FIND_PACKAGE(GTest REQUIRED) add_subdirectory (AmControlInterfaceTest) add_subdirectory (AmDatabaseHandlerTest) -- cgit v1.2.1