diff options
| author | Christian Kamm <kamm@incasoftware.de> | 2014-11-19 16:45:25 +0300 |
|---|---|---|
| committer | Christian Kamm <kamm@incasoftware.de> | 2014-11-19 16:45:25 +0300 |
| commit | 4d7b8bdb25b51128ab0a339ff946a9a5804b3a0a (patch) | |
| tree | 0a8019522eb256fb6f63a80103816f4e338cefab /test/CMakeLists.txt | |
| parent | 3706c7662260da9af5ca8e54b218aea15522bc14 (diff) | |
| parent | 421a8cc6b796f69e36cfc46d86e730676737f9a9 (diff) | |
Merge remote-tracking branch 'origin/1.7'
Conflicts:
OWNCLOUD.cmake
test/CMakeLists.txt
test/testfolderwatcher.h
Diffstat (limited to 'test/CMakeLists.txt')
| -rw-r--r-- | test/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 9075449f4..40a076a28 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -27,8 +27,8 @@ endif(UNIX AND NOT APPLE) owncloud_add_test(CSyncSqlite "") owncloud_add_test(NetrcParser ../src/cmd/netrcparser.cpp) -owncloud_add_test(OwnSql ../src/libsync/ownsql.cpp) -owncloud_add_test(SyncJournalDB ../src/libsync/syncjournaldb.cpp) +owncloud_add_test(OwnSql "") +owncloud_add_test(SyncJournalDB "") |