summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt4
-rw-r--r--cmake/modules/FindGtest.cmake53
-rw-r--r--debian/control2
-rw-r--r--tests/CMakeLists.txt4
-rw-r--r--tests/mirserver/Clipboard/CMakeLists.txt3
-rw-r--r--tests/mirserver/QtEventFeeder/CMakeLists.txt3
-rw-r--r--tests/mirserver/Screen/CMakeLists.txt3
-rw-r--r--tests/modules/ApplicationManager/CMakeLists.txt3
-rw-r--r--tests/modules/DesktopFileReader/CMakeLists.txt3
-rw-r--r--tests/modules/General/CMakeLists.txt3
-rw-r--r--tests/modules/MirSurfaceItem/CMakeLists.txt3
-rw-r--r--tests/modules/SessionManager/CMakeLists.txt3
-rw-r--r--tests/modules/TaskController/CMakeLists.txt3
13 files changed, 13 insertions, 77 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1a2bbd2..7113525 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,9 +14,7 @@ endif()
set(CMAKE_INCLUDE_CURRENT_DIR ON)
# add custom cmake modules
-# cmake-extras module path - not equal to ${CMAKE_ROOT}/Modules due to bug:1394648
-set(CMAKE_EXTRAS_MODULE_PATH /usr/share/cmake-2.8/Modules)
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_EXTRAS_MODULE_PATH})
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
# Instruct CMake to run moc automatically when needed.
set(CMAKE_AUTOMOC ON)
diff --git a/cmake/modules/FindGtest.cmake b/cmake/modules/FindGtest.cmake
deleted file mode 100644
index c249b02..0000000
--- a/cmake/modules/FindGtest.cmake
+++ /dev/null
@@ -1,53 +0,0 @@
-include(ExternalProject)
-include(FindPackageHandleStandardArgs)
-
-#gtest
-set(GTEST_INSTALL_DIR /usr/src/gmock/gtest/include)
-find_path(GTEST_INCLUDE_DIR gtest/gtest.h
- HINTS ${GTEST_INSTALL_DIR})
-
-#gmock
-find_path(GMOCK_INSTALL_DIR gmock/CMakeLists.txt
- HINTS /usr/src)
-if(${GMOCK_INSTALL_DIR} STREQUAL "GMOCK_INSTALL_DIR-NOTFOUND")
- message(FATAL_ERROR "google-mock package not found")
-endif()
-
-set(GMOCK_INSTALL_DIR ${GMOCK_INSTALL_DIR}/gmock)
-find_path(GMOCK_INCLUDE_DIR gmock/gmock.h)
-
-set(GMOCK_PREFIX gmock)
-set(GMOCK_BINARY_DIR ${CMAKE_BINARY_DIR}/${GMOCK_PREFIX}/libs)
-set(GTEST_BINARY_DIR ${GMOCK_BINARY_DIR}/gtest)
-
-set(GTEST_CMAKE_ARGS "")
-if (${CMAKE_CROSSCOMPILING})
- set(GTEST_CMAKE_ARGS
- -DCMAKE_TOOLCHAIN_FILE=${CMAKE_MODULE_PATH}/LinuxCrossCompile.cmake)
-endif()
-
-ExternalProject_Add(
- GMock
- #where to build in source tree
- PREFIX ${GMOCK_PREFIX}
- #where the source is external to the project
- SOURCE_DIR ${GMOCK_INSTALL_DIR}
- #forward the compilers to the subproject so cross-arch builds work
- CMAKE_ARGS ${GTEST_CMAKE_ARGS}
- BINARY_DIR ${GMOCK_BINARY_DIR}
-
- #we don't need to install, so skip
- INSTALL_COMMAND ""
-)
-
-set(GMOCK_LIBRARY ${GMOCK_BINARY_DIR}/libgmock.a)
-set(GMOCK_MAIN_LIBRARY ${GMOCK_BINARY_DIR}/libgmock_main.a)
-set(GMOCK_BOTH_LIBRARIES ${GMOCK_LIBRARY} ${GMOCK_MAIN_LIBRARY})
-set(GTEST_LIBRARY ${GTEST_BINARY_DIR}/libgtest.a)
-set(GTEST_MAIN_LIBRARY ${GTEST_BINARY_DIR}/libgtest_main.a)
-set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARY} ${GTEST_MAIN_LIBRARY})
-set(GTEST_ALL_LIBRARIES ${GTEST_BOTH_LIBRARIES} ${GMOCK_BOTH_LIBRARIES})
-
-find_package_handle_standard_args(GTest DEFAULT_MSG
- GMOCK_INCLUDE_DIR
- GTEST_INCLUDE_DIR)
diff --git a/debian/control b/debian/control
index 6794671..2c051d0 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libs
Priority: optional
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Build-Depends: cmake,
- cmake-extras,
+ cmake-extras (>= 0.3),
debhelper (>= 9),
# We rely on C++11 features, and to prevent from ABI breaks
# in libstdc++ causing us issues, we explicitly select a G++
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index d22b9eb..02fcb7a 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,4 +1,4 @@
-find_package(Gtest)
+find_package(GMock)
add_subdirectory(mirserver)
-add_subdirectory(modules) \ No newline at end of file
+add_subdirectory(modules)
diff --git a/tests/mirserver/Clipboard/CMakeLists.txt b/tests/mirserver/Clipboard/CMakeLists.txt
index 2a57f59..aea39a1 100644
--- a/tests/mirserver/Clipboard/CMakeLists.txt
+++ b/tests/mirserver/Clipboard/CMakeLists.txt
@@ -11,14 +11,13 @@ include_directories(
)
add_executable(ClipboardTest ${CLIPBOARD_TEST_SOURCES})
-add_dependencies(ClipboardTest GMock)
target_link_libraries(
ClipboardTest
qpa-mirserver
${GTEST_BOTH_LIBRARIES}
- ${GMOCK_BOTH_LIBRARIES}
+ ${GMOCK_LIBRARIES}
)
add_test(Clipboard, ClipboardTest)
diff --git a/tests/mirserver/QtEventFeeder/CMakeLists.txt b/tests/mirserver/QtEventFeeder/CMakeLists.txt
index 077fd44..2239ae7 100644
--- a/tests/mirserver/QtEventFeeder/CMakeLists.txt
+++ b/tests/mirserver/QtEventFeeder/CMakeLists.txt
@@ -12,13 +12,12 @@ include_directories(
)
add_executable(QtEventFeederTest ${EVENT_FEEDER_TEST_SOURCES})
-add_dependencies(QtEventFeederTest GMock)
target_link_libraries(
QtEventFeederTest
qpa-mirserver
${GTEST_BOTH_LIBRARIES}
- ${GMOCK_BOTH_LIBRARIES}
+ ${GMOCK_LIBRARIES}
)
add_test(QtEventFeeder, QtEventFeederTest)
diff --git a/tests/mirserver/Screen/CMakeLists.txt b/tests/mirserver/Screen/CMakeLists.txt
index 7775a81..a278fcd 100644
--- a/tests/mirserver/Screen/CMakeLists.txt
+++ b/tests/mirserver/Screen/CMakeLists.txt
@@ -12,14 +12,13 @@ include_directories(
)
add_executable(ScreenTest ${SCREEN_TEST_SOURCES})
-add_dependencies(ScreenTest GMock)
target_link_libraries(
ScreenTest
qpa-mirserver
${GTEST_BOTH_LIBRARIES}
- ${GMOCK_BOTH_LIBRARIES}
+ ${GMOCK_LIBRARIES}
)
add_test(Screen, ScreenTest)
diff --git a/tests/modules/ApplicationManager/CMakeLists.txt b/tests/modules/ApplicationManager/CMakeLists.txt
index a17f0ea..6590576 100644
--- a/tests/modules/ApplicationManager/CMakeLists.txt
+++ b/tests/modules/ApplicationManager/CMakeLists.txt
@@ -12,7 +12,6 @@ include_directories(
)
add_executable(applicationmanager_test ${APPLICATION_MANAGER_TEST_SOURCES})
-add_dependencies(applicationmanager_test GMock)
target_link_libraries(
applicationmanager_test
@@ -23,7 +22,7 @@ target_link_libraries(
Qt5::Test
${GTEST_BOTH_LIBRARIES}
- ${GMOCK_BOTH_LIBRARIES}
+ ${GMOCK_LIBRARIES}
)
add_test(ApplicationManager applicationmanager_test)
diff --git a/tests/modules/DesktopFileReader/CMakeLists.txt b/tests/modules/DesktopFileReader/CMakeLists.txt
index f10cda7..e23fda3 100644
--- a/tests/modules/DesktopFileReader/CMakeLists.txt
+++ b/tests/modules/DesktopFileReader/CMakeLists.txt
@@ -12,7 +12,6 @@ include_directories(
)
add_executable(desktop_file_reader_test ${DESKTOP_FILE_READER_TEST_SOURCES})
-add_dependencies(desktop_file_reader_test GMock)
target_link_libraries(
desktop_file_reader_test
@@ -23,7 +22,7 @@ target_link_libraries(
Qt5::Gui
${GTEST_BOTH_LIBRARIES}
- ${GMOCK_BOTH_LIBRARIES}
+ ${GMOCK_LIBRARIES}
)
add_test(DesktopFileReader desktop_file_reader_test)
diff --git a/tests/modules/General/CMakeLists.txt b/tests/modules/General/CMakeLists.txt
index 66cf9c8..a9aa3b3 100644
--- a/tests/modules/General/CMakeLists.txt
+++ b/tests/modules/General/CMakeLists.txt
@@ -14,7 +14,6 @@ include_directories(
)
add_executable(general_test ${GENERAL_TEST_SOURCES})
-add_dependencies(general_test GMock)
target_link_libraries(
general_test
@@ -25,7 +24,7 @@ target_link_libraries(
Qt5::Gui
${GTEST_BOTH_LIBRARIES}
- ${GMOCK_BOTH_LIBRARIES}
+ ${GMOCK_LIBRARIES}
)
add_test(General general_test)
diff --git a/tests/modules/MirSurfaceItem/CMakeLists.txt b/tests/modules/MirSurfaceItem/CMakeLists.txt
index b725cf1..36d16a8 100644
--- a/tests/modules/MirSurfaceItem/CMakeLists.txt
+++ b/tests/modules/MirSurfaceItem/CMakeLists.txt
@@ -11,7 +11,6 @@ include_directories(
)
add_executable(mirsurfaceitem_test ${MIR_SURFACE_ITEM_TEST_SOURCES})
-add_dependencies(mirsurfaceitem_test GMock)
target_link_libraries(
mirsurfaceitem_test
@@ -22,7 +21,7 @@ target_link_libraries(
Qt5::Test
${GTEST_BOTH_LIBRARIES}
- ${GMOCK_BOTH_LIBRARIES}
+ ${GMOCK_LIBRARIES}
)
add_test(MirSurfaceItem mirsurfaceitem_test)
diff --git a/tests/modules/SessionManager/CMakeLists.txt b/tests/modules/SessionManager/CMakeLists.txt
index 935ff6a..a4e25d2 100644
--- a/tests/modules/SessionManager/CMakeLists.txt
+++ b/tests/modules/SessionManager/CMakeLists.txt
@@ -13,7 +13,6 @@ include_directories(
)
add_executable(sessionmanager_test ${SESSION_MANAGER_TEST_SOURCES})
-add_dependencies(sessionmanager_test GMock)
target_link_libraries(
sessionmanager_test
@@ -24,7 +23,7 @@ target_link_libraries(
Qt5::Test
${GTEST_BOTH_LIBRARIES}
- ${GMOCK_BOTH_LIBRARIES}
+ ${GMOCK_LIBRARIES}
)
add_test(SessionManager, sessionmanager_test)
diff --git a/tests/modules/TaskController/CMakeLists.txt b/tests/modules/TaskController/CMakeLists.txt
index 15d0f48..e6785ab 100644
--- a/tests/modules/TaskController/CMakeLists.txt
+++ b/tests/modules/TaskController/CMakeLists.txt
@@ -11,7 +11,6 @@ include_directories(
)
add_executable(taskcontroller_test ${TASK_CONTROLLER_TEST_SOURCES})
-add_dependencies(taskcontroller_test GMock)
target_link_libraries(
taskcontroller_test
@@ -20,7 +19,7 @@ target_link_libraries(
unityapplicationplugin
${GTEST_BOTH_LIBRARIES}
- ${GMOCK_BOTH_LIBRARIES}
+ ${GMOCK_LIBRARIES}
)
add_test(TaskController, taskcontroller_test)
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-25 11:46:10 +0000