2 files changed, 30 insertions, 15 deletions
diff --git a/tests/modules/General/CMakeLists.txt b/tests/modules/General/CMakeLists.txt
new file mode 100644
index 0000000..a9aa3b3
--- /dev/null
+++ b/tests/modules/General/CMakeLists.txt
@@ -0,0 +1,30 @@
+set(
+  GENERAL_TEST_SOURCES
+  objectlistmodel_test.cpp
+  ${CMAKE_SOURCE_DIR}/src/common/debughelpers.cpp
+)
+
+include_directories(
+  ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
+  ${CMAKE_SOURCE_DIR}/src/common
+  ${CMAKE_SOURCE_DIR}/src/modules
+  ${CMAKE_SOURCE_DIR}/tests/modules/common
+  ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
+  ${MIRSERVER_INCLUDE_DIRS}
+)
+
+add_executable(general_test ${GENERAL_TEST_SOURCES})
+
+target_link_libraries(
+  general_test
+
+  qpa-mirserver
+  unityapplicationplugin
+
+  Qt5::Gui
+
+  ${GTEST_BOTH_LIBRARIES}
+  ${GMOCK_LIBRARIES}
+)
+
+add_test(General general_test)
diff --git a/tests/modules/General/General.pro b/tests/modules/General/General.pro
deleted file mode 100644
index 8bf2d2f..0000000
--- a/tests/modules/General/General.pro
+++ /dev/null
@@ -1,15 +0,0 @@
-include(../../test-includes.pri)
-include(../common/common.pri)
-
-TARGET = general_tests
-
-INCLUDEPATH += \
-    ../../../src/platforms/mirserver
-
-SOURCES += \
-    objectlistmodel_test.cpp \
-
-# need to link in the QPA plugin too for access to MirServerConfiguration
-LIBS += -Wl,-rpath,$${PWD}/../../../src/platforms/mirserver \
-    -L../../../src/platforms/mirserver -lqpa-mirserver
-