Convert from autotools to CMake

8 files changed, 123 insertions, 97 deletions

diff --git a/tests/test-server-utils/CMakeLists.txt b/tests/test-server-utils/CMakeLists.txt
new file mode 100644
index 000000000..70c8bd994
--- /dev/null
+++ b/tests/test-server-utils/CMakeLists.txt
@@ -0,0 +1,108 @@
+add_subdirectory(services)
+
+set(SOURCES
+	e-test-server-utils.c
+	e-test-server-utils.h
+)
+
+set(extra_deps
+	ebook
+	ecal
+)
+
+set(extra_defines
+	-DEDS_TEST_DBUS_SERVICE_DIR=\"${CMAKE_BINARY_DIR}/tests/test-server-utils/services\"
+	-DEDS_TEST_WORK_DIR=\"${CMAKE_BINARY_DIR}/tests/test-server-utils/cache\"
+	-DEDS_TEST_SCHEMA_DIR=\"${CMAKE_BINARY_DIR}/data\"
+	-DEDS_TEST_ADDRESS_BOOK_DIR=\"${CMAKE_BINARY_DIR}/addressbook/backends/file\"
+	-DEDS_TEST_CALENDAR_DIR=\"${CMAKE_BINARY_DIR}/calendar/backends/file\"
+	-DEDS_TEST_REGISTRY_DIR=\"${CMAKE_BINARY_DIR}/modules/cache-reaper\"
+	-DEDS_TEST_CAMEL_DIR=\"${CMAKE_BINARY_DIR}/camel/providers/local\"
+	-DEDS_TEST_SUBPROCESS_CAL_PATH=\"${CMAKE_BINARY_DIR}/calendar/libedata-cal/evolution-calendar-factory-subprocess\"
+	-DEDS_TEST_SUBPROCESS_BOOK_PATH=\"${CMAKE_BINARY_DIR}/addressbook/libedata-book/evolution-addressbook-factory-subprocess\"
+	-DEDS_TEST_TOP_BUILD_DIR=\"${CMAKE_BINARY_DIR}\"
+)
+
+set(extra_cflags
+	${ADDRESSBOOK_CFLAGS}
+	${CALENDAR_CFLAGS}
+	${GIO_UNIX_CFLAGS}
+)
+
+set(extra_incdirs
+	${ADDRESSBOOK_INCLUDE_DIRS}
+	${CALENDAR_INCLUDE_DIRS}
+	${GIO_UNIX_INCLUDE_DIRS}
+)
+
+set(extra_ldflags
+	${ADDRESSBOOK_LDFLAGS}
+	${CALENDAR_LDFLAGS}
+	${GIO_UNIX_LDFLAGS}
+)
+
+# ***************************
+# Utility library
+# ***************************
+
+add_library(etestserverutils SHARED ${SOURCES})
+
+add_dependencies(etestserverutils
+	edataserver
+	evolution-addressbook-factory
+	evolution-calendar-factory
+	evolution-source-registry
+	${extra_deps}
+)
+
+target_compile_definitions(etestserverutils PRIVATE
+	-DG_LOG_DOMAIN=\"e-test-server-utils\"
+	${extra_defines}
+)
+
+target_compile_options(etestserverutils PUBLIC
+	${BACKEND_CFLAGS}
+	${DATA_SERVER_CFLAGS}
+	${extra_cflags}
+)
+
+target_include_directories(etestserverutils PUBLIC
+	${CMAKE_BINARY_DIR}
+	${CMAKE_SOURCE_DIR}
+	${BACKEND_INCLUDE_DIRS}
+	${DATA_SERVER_INCLUDE_DIRS}
+	${extra_incdirs}
+)
+
+target_link_libraries(etestserverutils
+	edataserver
+	${extra_deps}
+	${BACKEND_LDFLAGS}
+	${DATA_SERVER_LDFLAGS}
+	${extra_ldflags}
+)
+
+if(ENABLE_INSTALLED_FLAGS)
+	install(TARGETS etestserverutils
+		DESTINATION ${LIB_INSTALL_DIR}
+	)
+endif(ENABLE_INSTALLED_FLAGS)
+
+# ***************************
+# Local Unit Test
+# ***************************
+
+set(SOURCES
+	test-fixture.c
+)
+
+add_installable_test(test-fixture
+	SOURCES
+	extra_deps
+	extra_defines
+	extra_cflags
+	extra_incdirs
+	extra_ldflags
+	"session-exclusive"
+	"TEST_INSTALLED_SERVICES=1"
+)
diff --git a/tests/test-server-utils/Makefile.am b/tests/test-server-utils/Makefile.am
deleted file mode 100644
index b0f6aae15..000000000
--- a/tests/test-server-utils/Makefile.am
+++ /dev/null
@@ -1,84 +0,0 @@
-NULL =
-
-SUBDIRS = services
-
-@GNOME_CODE_COVERAGE_RULES@
-
-common_cflags = \
-	$(AM_CPPFLAGS) \
-	-I$(top_srcdir) \
-	-I$(top_builddir) \
-	-I$(top_srcdir)/addressbook \
-	-I$(top_builddir)/addressbook \
-	-I$(top_srcdir)/calendar \
-	-I$(top_builddir)/calendar \
-	-DG_LOG_DOMAIN=\"e-test-server-utils\" \
-	-DEDS_TEST_DBUS_SERVICE_DIR=\""$(abs_top_builddir)/tests/test-server-utils/services"\" \
-	-DEDS_TEST_WORK_DIR=\""$(abs_top_builddir)/tests/test-server-utils/cache"\" \
-	-DEDS_TEST_SCHEMA_DIR=\""$(abs_top_builddir)/data"\" \
-	-DEDS_TEST_ADDRESS_BOOK_DIR=\""$(abs_top_builddir)/addressbook/backends/file/.libs"\" \
-	-DEDS_TEST_CALENDAR_DIR=\""$(abs_top_builddir)/calendar/backends/file/.libs"\" \
-	-DEDS_TEST_REGISTRY_DIR=\""$(abs_top_builddir)/modules/cache-reaper/.libs"\" \
-	-DEDS_TEST_CAMEL_DIR=\""$(abs_top_builddir)/camel/providers/local/.libs"\" \
-	-DEDS_TEST_SUBPROCESS_CAL_PATH=\""$(abs_top_builddir)/calendar/libedata-cal/.libs/evolution-calendar-factory-subprocess"\" \
-	-DEDS_TEST_SUBPROCESS_BOOK_PATH=\""$(abs_top_builddir)/addressbook/libedata-book/.libs/evolution-addressbook-factory-subprocess"\" \
-	-DEDS_TEST_TOP_BUILD_DIR=\""$(abs_top_builddir)/"\" \
-	$(E_DATA_SERVER_CFLAGS) \
-	$(EVOLUTION_CALENDAR_CFLAGS) \
-	$(GIO_UNIX_CFLAGS) \
-	$(NULL)
-
-common_libs = \
-	$(top_builddir)/libedataserver/libedataserver-1.2.la \
-	$(top_builddir)/addressbook/libebook/libebook-1.2.la \
-	$(top_builddir)/calendar/libecal/libecal-1.2.la \
-	$(E_DATA_SERVER_LIBS) \
-	$(EVOLUTION_CALENDAR_LIBS) \
-	$(GIO_UNIX_LIBS) \
-	$(NULL)
-
-######################################
-#         Utility Library            #
-######################################
-if EDS_INSTALLED_TESTS_ENABLED
-lib_LTLIBRARIES = libetestserverutils.la
-else
-noinst_LTLIBRARIES = libetestserverutils.la
-endif
-
-libetestserverutils_la_CPPFLAGS = $(common_cflags)
-libetestserverutils_la_LIBADD = $(common_libs)
-libetestserverutils_la_SOURCES = \
-	e-test-server-utils.c \
-	e-test-server-utils.h \
-	$(NULL)
-
-######################################
-#         Local Unit Tests           #
-######################################
-noinst_PROGRAMS = $(TESTS)
-
-TESTS = test-fixture
-
-test_fixture_CPPFLAGS = $(common_cflags)
-test_fixture_LDADD    = $(common_libs) libetestserverutils.la
-test_fixture_SOURCES  = test-fixture.c
-
-######################################
-# The test directory needs to be     #
-# cleaned in order to pass distcheck #
-######################################
-clean-local: clean-local-check
-.PHONY: clean-local-check
-clean-local-check:
-	-rm -rf $(abs_top_builddir)/tests/test-server-utils/cache
-
--include $(top_srcdir)/git.mk
-
-#####################################
-#     Optionally Install Tests      #
-#####################################
-@EDS_INSTALLED_TESTS_RULE@
-INSTALLED_TESTS = $(TESTS)
-INSTALLED_TESTS_TYPE = session-exclusive
-INSTALLED_TESTS_ENVIRONMENT = "TEST_INSTALLED_SERVICES=1"
diff --git a/tests/test-server-utils/e-test-server-utils.c b/tests/test-server-utils/e-test-server-utils.c
index 180ef036b..4c177ea9e 100644
--- a/tests/test-server-utils/e-test-server-utils.c
+++ b/tests/test-server-utils/e-test-server-utils.c
@@ -34,9 +34,7 @@
  * and e_test_server_utils_teardown() in thier fixture's setup and teardown routines.
  **/
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
 
 #include "e-test-server-utils.h"
 
diff --git a/tests/test-server-utils/services/CMakeLists.txt b/tests/test-server-utils/services/CMakeLists.txt
new file mode 100644
index 000000000..491d4da97
--- /dev/null
+++ b/tests/test-server-utils/services/CMakeLists.txt
@@ -0,0 +1,11 @@
+configure_file(org.gnome.evolution.dataserver.AddressBook.service.in
+	org.gnome.evolution.dataserver.AddressBook.service
+	@ONLY)
+
+configure_file(org.gnome.evolution.dataserver.Calendar.service.in
+	org.gnome.evolution.dataserver.Calendar.service
+	@ONLY)
+
+configure_file(org.gnome.evolution.dataserver.Sources.service.in
+	org.gnome.evolution.dataserver.Sources.service
+	@ONLY)
diff --git a/tests/test-server-utils/services/Makefile.am b/tests/test-server-utils/services/Makefile.am
deleted file mode 100644
index b7bc2da8f..000000000
--- a/tests/test-server-utils/services/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-EXTRA_DIST = \
-	org.gnome.evolution.dataserver.AddressBook.service.in	\
-	org.gnome.evolution.dataserver.Calendar.service.in	\
-	org.gnome.evolution.dataserver.Sources.service.in \
-	$(NULL)
-
--include $(top_srcdir)/git.mk
diff --git a/tests/test-server-utils/services/org.gnome.evolution.dataserver.AddressBook.service.in b/tests/test-server-utils/services/org.gnome.evolution.dataserver.AddressBook.service.in
index b32af7230..f7ae52883 100644
--- a/tests/test-server-utils/services/org.gnome.evolution.dataserver.AddressBook.service.in
+++ b/tests/test-server-utils/services/org.gnome.evolution.dataserver.AddressBook.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=@ADDRESS_BOOK_DBUS_SERVICE_NAME@
-Exec=@abs_top_builddir@/services/evolution-addressbook-factory/evolution-addressbook-factory
+Exec=@CMAKE_BINARY_DIR@/services/evolution-addressbook-factory/evolution-addressbook-factory
diff --git a/tests/test-server-utils/services/org.gnome.evolution.dataserver.Calendar.service.in b/tests/test-server-utils/services/org.gnome.evolution.dataserver.Calendar.service.in
index aa148e32c..17b3c3dcc 100644
--- a/tests/test-server-utils/services/org.gnome.evolution.dataserver.Calendar.service.in
+++ b/tests/test-server-utils/services/org.gnome.evolution.dataserver.Calendar.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=@CALENDAR_DBUS_SERVICE_NAME@
-Exec=@abs_top_builddir@/services/evolution-calendar-factory/evolution-calendar-factory
+Exec=@CMAKE_BINARY_DIR@/services/evolution-calendar-factory/evolution-calendar-factory
diff --git a/tests/test-server-utils/services/org.gnome.evolution.dataserver.Sources.service.in b/tests/test-server-utils/services/org.gnome.evolution.dataserver.Sources.service.in
index cd88998ac..d39ef9603 100644
--- a/tests/test-server-utils/services/org.gnome.evolution.dataserver.Sources.service.in
+++ b/tests/test-server-utils/services/org.gnome.evolution.dataserver.Sources.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=@SOURCES_DBUS_SERVICE_NAME@
-Exec=@abs_top_builddir@/services/evolution-source-registry/evolution-source-registry
+Exec=@CMAKE_BINARY_DIR@/services/evolution-source-registry/evolution-source-registry