diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2014-07-07 18:30:32 +0400 |
|---|---|---|
| committer | Olivier Goffart <ogoffart@woboq.com> | 2014-07-10 00:44:08 +0400 |
| commit | 45d1567057618736e018a15e27b4930c29f09829 (patch) | |
| tree | 42115f95dddf21d51f93ff3988fbb1fe7a4a6207 /test | |
| parent | 8aacb3f7ecf5f6d790304612f445fbb262e7f7d2 (diff) | |
Move Folder, FolderMan, and FolderWatcher outside of owncloudsync
Those class are maintaining the folder for the mirall configuration
They are not usefull in command line clients
Also the FolderWatcher is only used by the folder and not used by the
command line clients
Diffstat (limited to 'test')
| -rw-r--r-- | test/CMakeLists.txt | 26 | ||||
| -rw-r--r-- | test/owncloud_add_test.cmake | 7 |
2 files changed, 24 insertions, 9 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 3521be168..37ac1e83b 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -4,13 +4,27 @@ include_directories(${CMAKE_SOURCE_DIR}/csync/src/std) include(owncloud_add_test.cmake) -owncloud_add_test(OwncloudPropagator) -owncloud_add_test(Utility) -owncloud_add_test(Updater) -owncloud_add_test(FolderWatcher) -owncloud_add_test(CSyncSqlite) +owncloud_add_test(OwncloudPropagator "") +owncloud_add_test(Utility "") +owncloud_add_test(Updater "") +SET(FolderWatcher_SRC ../src/mirall/folderwatcher.cpp) + +IF( NOT WIN32 AND NOT APPLE ) +list(APPEND FolderWatcher_SRC ../src/mirall/folderwatcher_linux.cpp) +ENDIF() +IF( WIN32 ) +list(APPEND FolderWatcher_SRC ../src/mirall/folderwatcher_win.cpp) +ENDIF() +IF( APPLE ) +list(APPEND FolderWatcher_SRC ../src/mirall/folderwatcher_mac.cpp) +ENDIF() + +owncloud_add_test(FolderWatcher "${FolderWatcher_SRC}") if( UNIX AND NOT APPLE ) - owncloud_add_test(InotifyWatcher) + owncloud_add_test(InotifyWatcher "${FolderWatcher_SRC}") endif(UNIX AND NOT APPLE) +owncloud_add_test(CSyncSqlite "") + + diff --git a/test/owncloud_add_test.cmake b/test/owncloud_add_test.cmake index a7bf265a0..523819b64 100644 --- a/test/owncloud_add_test.cmake +++ b/test/owncloud_add_test.cmake @@ -1,13 +1,14 @@ -macro(owncloud_add_test test_class) +macro(owncloud_add_test test_class additional_cpp) include_directories(${QT_INCLUDES} "${PROJECT_SOURCE_DIR}/src" ${CMAKE_CURRENT_BINARY_DIR}) set(OWNCLOUD_TEST_CLASS ${test_class}) + set(CMAKE_AUTOMOC TRUE) string(TOLOWER "${OWNCLOUD_TEST_CLASS}" OWNCLOUD_TEST_CLASS_LOWERCASE) configure_file(main.cpp.in test${OWNCLOUD_TEST_CLASS_LOWERCASE}.cpp) configure_file(test${OWNCLOUD_TEST_CLASS_LOWERCASE}.h test${OWNCLOUD_TEST_CLASS_LOWERCASE}.h) - qt_wrap_cpp(${OWNCLOUD_TEST_CLASS}_MOCS test${OWNCLOUD_TEST_CLASS_LOWERCASE}.h) + qt_wrap_cpp(test${OWNCLOUD_TEST_CLASS_LOWERCASE}.h) - add_executable(${OWNCLOUD_TEST_CLASS}Test test${OWNCLOUD_TEST_CLASS_LOWERCASE}.cpp ${${OWNCLOUD_TEST_CLASS}_MOCS}) + add_executable(${OWNCLOUD_TEST_CLASS}Test test${OWNCLOUD_TEST_CLASS_LOWERCASE}.cpp ${additional_cpp}) qt5_use_modules(${OWNCLOUD_TEST_CLASS}Test Test Sql Xml) target_link_libraries(${OWNCLOUD_TEST_CLASS}Test |