diff options
| author | Milan Crha <mcrha@redhat.com> | 2016-10-11 11:47:14 +0200 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2016-10-11 11:47:14 +0200 |
| commit | d7931c6dd9db1e090f4bb466983c3dced19e2201 (patch) | |
| tree | 31e31eef195355e800c63be6b4dcfefe6e37bb84 /tests/test-server-utils | |
| parent | 4febe3ae82e850ca9f17229dd2dbd9cdd8708a8f (diff) | |
| download | evolution-data-server-d7931c6dd9db1e090f4bb466983c3dced19e2201.tar.gz | |
Reorganize directory structure
Let's have it as it's common to be, which means top level src/ for
sources, single data/ for data, and so on.
Diffstat (limited to 'tests/test-server-utils')
4 files changed, 12 insertions, 11 deletions
diff --git a/tests/test-server-utils/CMakeLists.txt b/tests/test-server-utils/CMakeLists.txt index 70c8bd994..dc5848791 100644 --- a/tests/test-server-utils/CMakeLists.txt +++ b/tests/test-server-utils/CMakeLists.txt @@ -14,13 +14,13 @@ 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}\" + -DEDS_TEST_ADDRESS_BOOK_DIR=\"${CMAKE_BINARY_DIR}/src/addressbook/backends/file\" + -DEDS_TEST_CALENDAR_DIR=\"${CMAKE_BINARY_DIR}/src/calendar/backends/file\" + -DEDS_TEST_REGISTRY_DIR=\"${CMAKE_BINARY_DIR}/src/modules/cache-reaper\" + -DEDS_TEST_CAMEL_DIR=\"${CMAKE_BINARY_DIR}/src/camel/providers/local\" + -DEDS_TEST_SUBPROCESS_CAL_PATH=\"${CMAKE_BINARY_DIR}/src/calendar/libedata-cal/evolution-calendar-factory-subprocess\" + -DEDS_TEST_SUBPROCESS_BOOK_PATH=\"${CMAKE_BINARY_DIR}/src/addressbook/libedata-book/evolution-addressbook-factory-subprocess\" + -DEDS_TEST_TOP_BUILD_DIR=\"${CMAKE_BINARY_DIR}/src\" ) set(extra_cflags @@ -68,7 +68,8 @@ target_compile_options(etestserverutils PUBLIC target_include_directories(etestserverutils PUBLIC ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR} + ${CMAKE_BINARY_DIR}/src + ${CMAKE_SOURCE_DIR}/src ${BACKEND_INCLUDE_DIRS} ${DATA_SERVER_INCLUDE_DIRS} ${extra_incdirs} 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 f7ae52883..572dd264b 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=@CMAKE_BINARY_DIR@/services/evolution-addressbook-factory/evolution-addressbook-factory +Exec=@CMAKE_BINARY_DIR@/src/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 17b3c3dcc..e013cb86a 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=@CMAKE_BINARY_DIR@/services/evolution-calendar-factory/evolution-calendar-factory +Exec=@CMAKE_BINARY_DIR@/src/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 d39ef9603..ef03d3d14 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=@CMAKE_BINARY_DIR@/services/evolution-source-registry/evolution-source-registry +Exec=@CMAKE_BINARY_DIR@/src/services/evolution-source-registry/evolution-source-registry |