From 28a0971cdfbb3fcb77c49df078062d8b3d756fcb Mon Sep 17 00:00:00 2001 From: Jocelyn Turcotte Date: Mon, 14 Aug 2017 19:19:52 +0200 Subject: [PATCH] Move csync to src/csync --- CMakeLists.txt | 1 - csync/CMakeLists.txt | 33 ------------------- src/CMakeLists.txt | 1 + src/cmd/CMakeLists.txt | 5 ++- {csync => src/csync}/AUTHORS | 0 {csync/src => src/csync}/CMakeLists.txt | 29 +++++++++++++++- {csync => src/csync}/COPYING | 0 {csync => src/csync}/ChangeLog | 0 {csync => src/csync}/ConfigureChecks.cmake | 0 {csync => src/csync}/DefineOptions.cmake | 0 {csync => src/csync}/INSTALL | 0 {csync => src/csync}/README | 0 {csync => src/csync}/config_csync.h.cmake | 0 {csync/src => src/csync}/csync.c | 0 {csync/src => src/csync}/csync.h | 0 {csync/src => src/csync}/csync_exclude.c | 0 {csync/src => src/csync}/csync_exclude.h | 0 {csync/src => src/csync}/csync_log.c | 0 {csync/src => src/csync}/csync_log.h | 0 {csync/src => src/csync}/csync_macros.h | 0 {csync/src => src/csync}/csync_misc.c | 0 {csync/src => src/csync}/csync_misc.h | 0 {csync/src => src/csync}/csync_private.h | 0 {csync/src => src/csync}/csync_reconcile.c | 0 {csync/src => src/csync}/csync_reconcile.h | 0 {csync/src => src/csync}/csync_rename.cc | 0 {csync/src => src/csync}/csync_rename.h | 0 {csync/src => src/csync}/csync_statedb.c | 0 {csync/src => src/csync}/csync_statedb.h | 0 {csync/src => src/csync}/csync_time.c | 0 {csync/src => src/csync}/csync_time.h | 0 {csync/src => src/csync}/csync_update.c | 0 {csync/src => src/csync}/csync_update.h | 0 {csync/src => src/csync}/csync_util.c | 0 {csync/src => src/csync}/csync_util.h | 0 {csync/src => src/csync}/csync_version.h.in | 0 {csync/src => src/csync}/std/CMakeLists.txt | 0 {csync/src => src/csync}/std/asprintf.c | 0 {csync/src => src/csync}/std/asprintf.h | 0 {csync/src => src/csync}/std/c_alloc.c | 0 {csync/src => src/csync}/std/c_alloc.h | 0 {csync/src => src/csync}/std/c_jhash.h | 0 {csync/src => src/csync}/std/c_lib.h | 0 {csync/src => src/csync}/std/c_macro.h | 0 {csync/src => src/csync}/std/c_path.c | 0 {csync/src => src/csync}/std/c_path.h | 0 {csync/src => src/csync}/std/c_private.h | 0 {csync/src => src/csync}/std/c_rbtree.c | 0 {csync/src => src/csync}/std/c_rbtree.h | 0 {csync/src => src/csync}/std/c_string.c | 0 {csync/src => src/csync}/std/c_string.h | 0 {csync/src => src/csync}/std/c_time.c | 0 {csync/src => src/csync}/std/c_time.h | 0 {csync/src => src/csync}/std/c_utf8.cc | 0 {csync/src => src/csync}/vio/csync_vio.c | 0 {csync/src => src/csync}/vio/csync_vio.h | 0 .../csync}/vio/csync_vio_file_stat.c | 0 .../src => src/csync}/vio/csync_vio_local.h | 0 .../csync}/vio/csync_vio_local_unix.c | 0 .../csync}/vio/csync_vio_local_win.c | 0 src/gui/CMakeLists.txt | 6 ++-- src/libsync/CMakeLists.txt | 5 ++- src/libsync/syncjournaldb.cpp | 2 +- test/CMakeLists.txt | 18 +++++++--- test/csync/csync_tests/check_csync_exclude.c | 2 +- test/owncloud_add_test.cmake | 15 --------- test/testexcludedfiles.cpp | 2 +- test/testsyncjournaldb.cpp | 4 +-- 68 files changed, 54 insertions(+), 69 deletions(-) delete mode 100644 csync/CMakeLists.txt rename {csync => src/csync}/AUTHORS (100%) rename {csync/src => src/csync}/CMakeLists.txt (82%) rename {csync => src/csync}/COPYING (100%) rename {csync => src/csync}/ChangeLog (100%) rename {csync => src/csync}/ConfigureChecks.cmake (100%) rename {csync => src/csync}/DefineOptions.cmake (100%) rename {csync => src/csync}/INSTALL (100%) rename {csync => src/csync}/README (100%) rename {csync => src/csync}/config_csync.h.cmake (100%) rename {csync/src => src/csync}/csync.c (100%) rename {csync/src => src/csync}/csync.h (100%) rename {csync/src => src/csync}/csync_exclude.c (100%) rename {csync/src => src/csync}/csync_exclude.h (100%) rename {csync/src => src/csync}/csync_log.c (100%) rename {csync/src => src/csync}/csync_log.h (100%) rename {csync/src => src/csync}/csync_macros.h (100%) rename {csync/src => src/csync}/csync_misc.c (100%) rename {csync/src => src/csync}/csync_misc.h (100%) rename {csync/src => src/csync}/csync_private.h (100%) rename {csync/src => src/csync}/csync_reconcile.c (100%) rename {csync/src => src/csync}/csync_reconcile.h (100%) rename {csync/src => src/csync}/csync_rename.cc (100%) rename {csync/src => src/csync}/csync_rename.h (100%) rename {csync/src => src/csync}/csync_statedb.c (100%) rename {csync/src => src/csync}/csync_statedb.h (100%) rename {csync/src => src/csync}/csync_time.c (100%) rename {csync/src => src/csync}/csync_time.h (100%) rename {csync/src => src/csync}/csync_update.c (100%) rename {csync/src => src/csync}/csync_update.h (100%) rename {csync/src => src/csync}/csync_util.c (100%) rename {csync/src => src/csync}/csync_util.h (100%) rename {csync/src => src/csync}/csync_version.h.in (100%) rename {csync/src => src/csync}/std/CMakeLists.txt (100%) rename {csync/src => src/csync}/std/asprintf.c (100%) rename {csync/src => src/csync}/std/asprintf.h (100%) rename {csync/src => src/csync}/std/c_alloc.c (100%) rename {csync/src => src/csync}/std/c_alloc.h (100%) rename {csync/src => src/csync}/std/c_jhash.h (100%) rename {csync/src => src/csync}/std/c_lib.h (100%) rename {csync/src => src/csync}/std/c_macro.h (100%) rename {csync/src => src/csync}/std/c_path.c (100%) rename {csync/src => src/csync}/std/c_path.h (100%) rename {csync/src => src/csync}/std/c_private.h (100%) rename {csync/src => src/csync}/std/c_rbtree.c (100%) rename {csync/src => src/csync}/std/c_rbtree.h (100%) rename {csync/src => src/csync}/std/c_string.c (100%) rename {csync/src => src/csync}/std/c_string.h (100%) rename {csync/src => src/csync}/std/c_time.c (100%) rename {csync/src => src/csync}/std/c_time.h (100%) rename {csync/src => src/csync}/std/c_utf8.cc (100%) rename {csync/src => src/csync}/vio/csync_vio.c (100%) rename {csync/src => src/csync}/vio/csync_vio.h (100%) rename {csync/src => src/csync}/vio/csync_vio_file_stat.c (100%) rename {csync/src => src/csync}/vio/csync_vio_local.h (100%) rename {csync/src => src/csync}/vio/csync_vio_local_unix.c (100%) rename {csync/src => src/csync}/vio/csync_vio_local_win.c (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index d4b2a52ca..976f19aec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -219,7 +219,6 @@ if(UNIT_TESTING) add_subdirectory(test) endif(UNIT_TESTING) -add_subdirectory(csync) add_subdirectory(src) if(NOT BUILD_LIBRARIES_ONLY) add_subdirectory(shell_integration) diff --git a/csync/CMakeLists.txt b/csync/CMakeLists.txt deleted file mode 100644 index 8b36dde86..000000000 --- a/csync/CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ - - -# global needed variables -set(APPLICATION_NAME "ocsync") - -set(LIBRARY_VERSION ${MIRALL_VERSION}) -set(LIBRARY_SOVERSION "0") - -# add definitions -include(DefineCMakeDefaults) -include(DefinePlatformDefaults) -include(DefineCompilerFlags) -include(DefineOptions.cmake) - -include(DefineInstallationPaths) - -# add macros -include(MacroAddPlugin) -include(MacroCopyFile) - -find_package(SQLite3 3.8.0 REQUIRED) - -include(ConfigureChecks.cmake) - -include_directories(${CMAKE_CURRENT_BINARY_DIR}) - -if (MEM_NULL_TESTS) - add_definitions(-DCSYNC_MEM_NULL_TESTS) -endif (MEM_NULL_TESTS) - -add_subdirectory(src) - -configure_file(config_csync.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config_csync.h) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3cbacd537..f871836cf 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -8,6 +8,7 @@ if(NOT TOKEN_AUTH_ONLY) find_package(Qt5Keychain REQUIRED) endif() +add_subdirectory(csync) add_subdirectory(libsync) if (NOT BUILD_LIBRARIES_ONLY) add_subdirectory(gui) diff --git a/src/cmd/CMakeLists.txt b/src/cmd/CMakeLists.txt index 4a0d76d71..26b641f21 100644 --- a/src/cmd/CMakeLists.txt +++ b/src/cmd/CMakeLists.txt @@ -12,9 +12,8 @@ include_directories(${CMAKE_SOURCE_DIR}/src/libsync ) # csync is required. -include_directories(${CMAKE_SOURCE_DIR}/csync/src - ${CMAKE_BINARY_DIR}/csync - ${CMAKE_BINARY_DIR}/csync/src +include_directories(${CMAKE_SOURCE_DIR}/src/csync + ${CMAKE_BINARY_DIR}/src/csync ) # Need tokenizer for netrc parser diff --git a/csync/AUTHORS b/src/csync/AUTHORS similarity index 100% rename from csync/AUTHORS rename to src/csync/AUTHORS diff --git a/csync/src/CMakeLists.txt b/src/csync/CMakeLists.txt similarity index 82% rename from csync/src/CMakeLists.txt rename to src/csync/CMakeLists.txt index 8bce5f418..db99a88d0 100644 --- a/csync/src/CMakeLists.txt +++ b/src/csync/CMakeLists.txt @@ -1,4 +1,31 @@ project(libcsync) +# global needed variables +set(APPLICATION_NAME "ocsync") + +set(LIBRARY_VERSION ${MIRALL_VERSION}) +set(LIBRARY_SOVERSION "0") + +# add definitions +include(DefineCMakeDefaults) +include(DefinePlatformDefaults) +include(DefineCompilerFlags) +include(DefineOptions.cmake) + +include(DefineInstallationPaths) + +# add macros +include(MacroAddPlugin) +include(MacroCopyFile) + +find_package(SQLite3 3.8.0 REQUIRED) + +include(ConfigureChecks.cmake) + +include_directories(${CMAKE_CURRENT_BINARY_DIR}) + +if (MEM_NULL_TESTS) + add_definitions(-DCSYNC_MEM_NULL_TESTS) +endif (MEM_NULL_TESTS) add_subdirectory(std) @@ -136,4 +163,4 @@ else() ) endif() - +configure_file(config_csync.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config_csync.h) diff --git a/csync/COPYING b/src/csync/COPYING similarity index 100% rename from csync/COPYING rename to src/csync/COPYING diff --git a/csync/ChangeLog b/src/csync/ChangeLog similarity index 100% rename from csync/ChangeLog rename to src/csync/ChangeLog diff --git a/csync/ConfigureChecks.cmake b/src/csync/ConfigureChecks.cmake similarity index 100% rename from csync/ConfigureChecks.cmake rename to src/csync/ConfigureChecks.cmake diff --git a/csync/DefineOptions.cmake b/src/csync/DefineOptions.cmake similarity index 100% rename from csync/DefineOptions.cmake rename to src/csync/DefineOptions.cmake diff --git a/csync/INSTALL b/src/csync/INSTALL similarity index 100% rename from csync/INSTALL rename to src/csync/INSTALL diff --git a/csync/README b/src/csync/README similarity index 100% rename from csync/README rename to src/csync/README diff --git a/csync/config_csync.h.cmake b/src/csync/config_csync.h.cmake similarity index 100% rename from csync/config_csync.h.cmake rename to src/csync/config_csync.h.cmake diff --git a/csync/src/csync.c b/src/csync/csync.c similarity index 100% rename from csync/src/csync.c rename to src/csync/csync.c diff --git a/csync/src/csync.h b/src/csync/csync.h similarity index 100% rename from csync/src/csync.h rename to src/csync/csync.h diff --git a/csync/src/csync_exclude.c b/src/csync/csync_exclude.c similarity index 100% rename from csync/src/csync_exclude.c rename to src/csync/csync_exclude.c diff --git a/csync/src/csync_exclude.h b/src/csync/csync_exclude.h similarity index 100% rename from csync/src/csync_exclude.h rename to src/csync/csync_exclude.h diff --git a/csync/src/csync_log.c b/src/csync/csync_log.c similarity index 100% rename from csync/src/csync_log.c rename to src/csync/csync_log.c diff --git a/csync/src/csync_log.h b/src/csync/csync_log.h similarity index 100% rename from csync/src/csync_log.h rename to src/csync/csync_log.h diff --git a/csync/src/csync_macros.h b/src/csync/csync_macros.h similarity index 100% rename from csync/src/csync_macros.h rename to src/csync/csync_macros.h diff --git a/csync/src/csync_misc.c b/src/csync/csync_misc.c similarity index 100% rename from csync/src/csync_misc.c rename to src/csync/csync_misc.c diff --git a/csync/src/csync_misc.h b/src/csync/csync_misc.h similarity index 100% rename from csync/src/csync_misc.h rename to src/csync/csync_misc.h diff --git a/csync/src/csync_private.h b/src/csync/csync_private.h similarity index 100% rename from csync/src/csync_private.h rename to src/csync/csync_private.h diff --git a/csync/src/csync_reconcile.c b/src/csync/csync_reconcile.c similarity index 100% rename from csync/src/csync_reconcile.c rename to src/csync/csync_reconcile.c diff --git a/csync/src/csync_reconcile.h b/src/csync/csync_reconcile.h similarity index 100% rename from csync/src/csync_reconcile.h rename to src/csync/csync_reconcile.h diff --git a/csync/src/csync_rename.cc b/src/csync/csync_rename.cc similarity index 100% rename from csync/src/csync_rename.cc rename to src/csync/csync_rename.cc diff --git a/csync/src/csync_rename.h b/src/csync/csync_rename.h similarity index 100% rename from csync/src/csync_rename.h rename to src/csync/csync_rename.h diff --git a/csync/src/csync_statedb.c b/src/csync/csync_statedb.c similarity index 100% rename from csync/src/csync_statedb.c rename to src/csync/csync_statedb.c diff --git a/csync/src/csync_statedb.h b/src/csync/csync_statedb.h similarity index 100% rename from csync/src/csync_statedb.h rename to src/csync/csync_statedb.h diff --git a/csync/src/csync_time.c b/src/csync/csync_time.c similarity index 100% rename from csync/src/csync_time.c rename to src/csync/csync_time.c diff --git a/csync/src/csync_time.h b/src/csync/csync_time.h similarity index 100% rename from csync/src/csync_time.h rename to src/csync/csync_time.h diff --git a/csync/src/csync_update.c b/src/csync/csync_update.c similarity index 100% rename from csync/src/csync_update.c rename to src/csync/csync_update.c diff --git a/csync/src/csync_update.h b/src/csync/csync_update.h similarity index 100% rename from csync/src/csync_update.h rename to src/csync/csync_update.h diff --git a/csync/src/csync_util.c b/src/csync/csync_util.c similarity index 100% rename from csync/src/csync_util.c rename to src/csync/csync_util.c diff --git a/csync/src/csync_util.h b/src/csync/csync_util.h similarity index 100% rename from csync/src/csync_util.h rename to src/csync/csync_util.h diff --git a/csync/src/csync_version.h.in b/src/csync/csync_version.h.in similarity index 100% rename from csync/src/csync_version.h.in rename to src/csync/csync_version.h.in diff --git a/csync/src/std/CMakeLists.txt b/src/csync/std/CMakeLists.txt similarity index 100% rename from csync/src/std/CMakeLists.txt rename to src/csync/std/CMakeLists.txt diff --git a/csync/src/std/asprintf.c b/src/csync/std/asprintf.c similarity index 100% rename from csync/src/std/asprintf.c rename to src/csync/std/asprintf.c diff --git a/csync/src/std/asprintf.h b/src/csync/std/asprintf.h similarity index 100% rename from csync/src/std/asprintf.h rename to src/csync/std/asprintf.h diff --git a/csync/src/std/c_alloc.c b/src/csync/std/c_alloc.c similarity index 100% rename from csync/src/std/c_alloc.c rename to src/csync/std/c_alloc.c diff --git a/csync/src/std/c_alloc.h b/src/csync/std/c_alloc.h similarity index 100% rename from csync/src/std/c_alloc.h rename to src/csync/std/c_alloc.h diff --git a/csync/src/std/c_jhash.h b/src/csync/std/c_jhash.h similarity index 100% rename from csync/src/std/c_jhash.h rename to src/csync/std/c_jhash.h diff --git a/csync/src/std/c_lib.h b/src/csync/std/c_lib.h similarity index 100% rename from csync/src/std/c_lib.h rename to src/csync/std/c_lib.h diff --git a/csync/src/std/c_macro.h b/src/csync/std/c_macro.h similarity index 100% rename from csync/src/std/c_macro.h rename to src/csync/std/c_macro.h diff --git a/csync/src/std/c_path.c b/src/csync/std/c_path.c similarity index 100% rename from csync/src/std/c_path.c rename to src/csync/std/c_path.c diff --git a/csync/src/std/c_path.h b/src/csync/std/c_path.h similarity index 100% rename from csync/src/std/c_path.h rename to src/csync/std/c_path.h diff --git a/csync/src/std/c_private.h b/src/csync/std/c_private.h similarity index 100% rename from csync/src/std/c_private.h rename to src/csync/std/c_private.h diff --git a/csync/src/std/c_rbtree.c b/src/csync/std/c_rbtree.c similarity index 100% rename from csync/src/std/c_rbtree.c rename to src/csync/std/c_rbtree.c diff --git a/csync/src/std/c_rbtree.h b/src/csync/std/c_rbtree.h similarity index 100% rename from csync/src/std/c_rbtree.h rename to src/csync/std/c_rbtree.h diff --git a/csync/src/std/c_string.c b/src/csync/std/c_string.c similarity index 100% rename from csync/src/std/c_string.c rename to src/csync/std/c_string.c diff --git a/csync/src/std/c_string.h b/src/csync/std/c_string.h similarity index 100% rename from csync/src/std/c_string.h rename to src/csync/std/c_string.h diff --git a/csync/src/std/c_time.c b/src/csync/std/c_time.c similarity index 100% rename from csync/src/std/c_time.c rename to src/csync/std/c_time.c diff --git a/csync/src/std/c_time.h b/src/csync/std/c_time.h similarity index 100% rename from csync/src/std/c_time.h rename to src/csync/std/c_time.h diff --git a/csync/src/std/c_utf8.cc b/src/csync/std/c_utf8.cc similarity index 100% rename from csync/src/std/c_utf8.cc rename to src/csync/std/c_utf8.cc diff --git a/csync/src/vio/csync_vio.c b/src/csync/vio/csync_vio.c similarity index 100% rename from csync/src/vio/csync_vio.c rename to src/csync/vio/csync_vio.c diff --git a/csync/src/vio/csync_vio.h b/src/csync/vio/csync_vio.h similarity index 100% rename from csync/src/vio/csync_vio.h rename to src/csync/vio/csync_vio.h diff --git a/csync/src/vio/csync_vio_file_stat.c b/src/csync/vio/csync_vio_file_stat.c similarity index 100% rename from csync/src/vio/csync_vio_file_stat.c rename to src/csync/vio/csync_vio_file_stat.c diff --git a/csync/src/vio/csync_vio_local.h b/src/csync/vio/csync_vio_local.h similarity index 100% rename from csync/src/vio/csync_vio_local.h rename to src/csync/vio/csync_vio_local.h diff --git a/csync/src/vio/csync_vio_local_unix.c b/src/csync/vio/csync_vio_local_unix.c similarity index 100% rename from csync/src/vio/csync_vio_local_unix.c rename to src/csync/vio/csync_vio_local_unix.c diff --git a/csync/src/vio/csync_vio_local_win.c b/src/csync/vio/csync_vio_local_win.c similarity index 100% rename from csync/src/vio/csync_vio_local_win.c rename to src/csync/vio/csync_vio_local_win.c diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 2157d3cd6..f7cc0a9db 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -181,11 +181,9 @@ set(3rdparty_INC include_directories(${3rdparty_INC}) # csync is required. -include_directories(${CMAKE_SOURCE_DIR}/csync/src - ${CMAKE_BINARY_DIR}/csync - ${CMAKE_BINARY_DIR}/csync/src +include_directories(${CMAKE_SOURCE_DIR}/src/csync + ${CMAKE_BINARY_DIR}/src/csync ) - include_directories(../libsync ${CMAKE_CURRENT_BINARY_DIR}/../libsync) include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} diff --git a/src/libsync/CMakeLists.txt b/src/libsync/CMakeLists.txt index 65d68823d..865dad895 100644 --- a/src/libsync/CMakeLists.txt +++ b/src/libsync/CMakeLists.txt @@ -5,9 +5,8 @@ configure_file( version.h.in "${CMAKE_CURRENT_BINARY_DIR}/version.h" ) include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) # csync is required. -include_directories(${CMAKE_SOURCE_DIR}/csync/src - ${CMAKE_BINARY_DIR}/csync - ${CMAKE_BINARY_DIR}/csync/src +include_directories(${CMAKE_SOURCE_DIR}/src/csync + ${CMAKE_BINARY_DIR}/src/csync ) if ( APPLE ) diff --git a/src/libsync/syncjournaldb.cpp b/src/libsync/syncjournaldb.cpp index 0eb34e609..203c14988 100644 --- a/src/libsync/syncjournaldb.cpp +++ b/src/libsync/syncjournaldb.cpp @@ -31,7 +31,7 @@ #include "asserts.h" #include "checksums.h" -#include "../../csync/src/std/c_jhash.h" +#include "std/c_jhash.h" namespace OCC { diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index ebf349207..d6b68cb5c 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,7 +1,17 @@ -include_directories(${CMAKE_BINARY_DIR}/csync ${CMAKE_BINARY_DIR}/csync/src ${CMAKE_BINARY_DIR}/src) -include_directories(${CMAKE_SOURCE_DIR}/csync/src/) -include_directories(${CMAKE_SOURCE_DIR}/csync/src/std ${CMAKE_SOURCE_DIR}/src) -include_directories(${CMAKE_SOURCE_DIR}/src/3rdparty/qtokenizer) +include_directories(${QT_INCLUDES} + ${CMAKE_SOURCE_DIR}/src + ${CMAKE_SOURCE_DIR}/src/3rdparty/qtokenizer + ${CMAKE_SOURCE_DIR}/src/csync + ${CMAKE_SOURCE_DIR}/src/csync/std + ${CMAKE_SOURCE_DIR}/src/gui + ${CMAKE_SOURCE_DIR}/src/libsync + ${CMAKE_BINARY_DIR}/src/csync + ${CMAKE_BINARY_DIR}/src/libsync + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ) + +include_directories() include(QtVersionAbstraction) setup_qt() diff --git a/test/csync/csync_tests/check_csync_exclude.c b/test/csync/csync_tests/check_csync_exclude.c index ea9ca0e2f..1d145b240 100644 --- a/test/csync/csync_tests/check_csync_exclude.c +++ b/test/csync/csync_tests/check_csync_exclude.c @@ -27,7 +27,7 @@ #define CSYNC_TEST 1 #include "csync_exclude.c" -#define EXCLUDE_LIST_FILE SOURCEDIR"/../sync-exclude.lst" +#define EXCLUDE_LIST_FILE SOURCEDIR"/../../sync-exclude.lst" static int setup(void **state) { CSYNC *csync; diff --git a/test/owncloud_add_test.cmake b/test/owncloud_add_test.cmake index cefe264ea..7e7cc5057 100644 --- a/test/owncloud_add_test.cmake +++ b/test/owncloud_add_test.cmake @@ -1,11 +1,4 @@ macro(owncloud_add_test test_class additional_cpp) - include_directories(${QT_INCLUDES} - "${PROJECT_SOURCE_DIR}/src/gui" - "${PROJECT_SOURCE_DIR}/src/libsync" - "${CMAKE_BINARY_DIR}/src/libsync" - "${CMAKE_CURRENT_BINARY_DIR}" - ) - set(CMAKE_AUTOMOC TRUE) set(OWNCLOUD_TEST_CLASS ${test_class}) string(TOLOWER "${OWNCLOUD_TEST_CLASS}" OWNCLOUD_TEST_CLASS_LOWERCASE) @@ -27,14 +20,6 @@ macro(owncloud_add_test test_class additional_cpp) endmacro() macro(owncloud_add_benchmark test_class additional_cpp) - include_directories(${CMAKE_CURRENT_SOURCE_DIR} - ${QT_INCLUDES} - "${PROJECT_SOURCE_DIR}/src/gui" - "${PROJECT_SOURCE_DIR}/src/libsync" - "${CMAKE_BINARY_DIR}/src/libsync" - "${CMAKE_CURRENT_BINARY_DIR}" - ) - set(CMAKE_AUTOMOC TRUE) set(OWNCLOUD_TEST_CLASS ${test_class}) string(TOLOWER "${OWNCLOUD_TEST_CLASS}" OWNCLOUD_TEST_CLASS_LOWERCASE) diff --git a/test/testexcludedfiles.cpp b/test/testexcludedfiles.cpp index b52bfb5a9..cfaf73499 100644 --- a/test/testexcludedfiles.cpp +++ b/test/testexcludedfiles.cpp @@ -11,7 +11,7 @@ using namespace OCC; -#define EXCLUDE_LIST_FILE SOURCEDIR"/../sync-exclude.lst" +#define EXCLUDE_LIST_FILE SOURCEDIR"/../../sync-exclude.lst" class TestExcludedFiles: public QObject { diff --git a/test/testsyncjournaldb.cpp b/test/testsyncjournaldb.cpp index 881bb865d..9e412aa85 100644 --- a/test/testsyncjournaldb.cpp +++ b/test/testsyncjournaldb.cpp @@ -8,8 +8,8 @@ #include -#include "libsync/syncjournaldb.h" -#include "libsync/syncjournalfilerecord.h" +#include "syncjournaldb.h" +#include "syncjournalfilerecord.h" using namespace OCC; -- 2.30.2