2 files changed, 32 insertions, 50 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
new file mode 100644
index 0000000..39cde1f
--- /dev/null
+++ b/tests/CMakeLists.txt
@@ -0,0 +1,32 @@
+find_package(GMock)
+
+SET(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -no-pie")
+
+# gtest-menuitems
+
+include_directories(
+    ${CMAKE_SOURCE_DIR}/src
+    ${PROJECT_DEPS_INCLUDE_DIRS}
+)
+
+set_source_files_properties(gtest-menuitems.cpp PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS})
+
+add_executable("gtest-menuitems" gtest-menuitems.cpp)
+target_link_libraries("gtest-menuitems"
+    ayatana-ido3-0.4
+
+    ${PROJECT_DEPS_LIBRARIES}
+
+    ${GTEST_LIBRARIES}
+    ${GTEST_BOTH_LIBRARIES}
+    ${GMOCK_LIBRARIES}
+)
+add_test("gtest-menuitems" "gtest-menuitems")
+add_dependencies("gtest-menuitems" ayatana-ido3-0.4)
+
+
+# coverage
+if (ENABLE_COVERAGE)
+    find_package(CoverageReport)
+    ENABLE_COVERAGE_REPORT(TARGETS "gtest-menuitems" TESTS "gtest-menuitems")
+endif()
diff --git a/tests/Makefile.am b/tests/Makefile.am
deleted file mode 100644
index a4bc763..0000000
--- a/tests/Makefile.am
+++ /dev/null
@@ -1,50 +0,0 @@
-IDOLIB = $(top_builddir)/src/libayatana-ido3-0.1.la
-
-# xorg-gtest isn't buildable https://bugs.launchpad.net/ubuntu/+source/xorg-gtest/+bug/1388892
-# check_LIBRARIES = libgtest.a
-check_PROGRAMS = 
-TESTS =
-
-AM_CPPFLAGS = \
-	$(GTEST_CPPFLAGS) \
-	-I${top_srcdir}/src
-
-#############################
-# Google Test base library
-#############################
-
-nodist_libgtest_a_SOURCES = \
-	$(XORG_GTEST_SOURCE)/src/xorg-gtest-all.cpp \
-	$(GTEST_SOURCE)/gtest-all.cc \
-	$(XORG_GTEST_SOURCE)/src/xorg-gtest_main.cpp
-libgtest_a_CPPFLAGS = \
-	$(XORG_GTEST_CPPFLAGS) \
-	$(AM_CPPFLAGS) \
-	$(GTEST_CPPFLAGS) -w
-libgtest_a_CXXFLAGS = \
-	$(AM_CXXFLAGS)
-
-#############################
-# Menuitem tests
-#############################
-
-# xorg-gtest isn't buildable https://bugs.launchpad.net/ubuntu/+source/xorg-gtest/+bug/1388892
-# TESTS += gtest-menuitems
-# check_PROGRAMS += gtest-menuitems
-
-gtest_menuitems_SOURCES = \
-	gtest-menuitems.cpp
-gtest_menuitems_CPPFLAGS = \
-	$(GCC_CFLAGS) \
-	$(GTK_CFLAGS) \
-	$(MAINTAINER_CFLAGS) \
-	$(AM_CPPFLAGS)
-gtest_menuitems_LDFLAGS = \
-	-pthread
-gtest_menuitems_LDADD = \
-	$(GTK_LIBS) \
-	$(IDOLIB) \
-	libgtest.a \
-	-lX11 -lXi
-
-DISTCLEANFILES = Makefile.in