diff options
author | Olivier Goffart <ogoffart@woboq.com> | 2018-10-04 12:19:50 +0300 |
---|---|---|
committer | Olivier Goffart <ogoffart@woboq.com> | 2018-10-04 12:23:19 +0300 |
commit | 28f1c95b965d37e4af784b5c234680eb01a2f56a (patch) | |
tree | a3133547f36533a68f59b336b7c8bfee229b8b06 /src/libsync/CMakeLists.txt | |
parent | 160fed84f44f1ed495b7a33988fad5ce99d2092d (diff) | |
parent | 319472e1797892afe84e844a20544d7085b34ca2 (diff) |
Merge remote-tracking branch 'origin/master' into new_discovery_algo
Conflicts:
src/csync/csync_reconcile.cpp
src/csync/csync_update.cpp
src/libsync/syncengine.cpp
src/libsync/syncengine.h
Note: csync changes from 5e442f588e86bb84a2e1cb31bce2c9311c58a990
are not included and will be fixed separately
Diffstat (limited to 'src/libsync/CMakeLists.txt')
-rw-r--r-- | src/libsync/CMakeLists.txt | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/src/libsync/CMakeLists.txt b/src/libsync/CMakeLists.txt index b0fecf572..b49c55b1b 100644 --- a/src/libsync/CMakeLists.txt +++ b/src/libsync/CMakeLists.txt @@ -37,7 +37,9 @@ set(libsync_SRCS owncloudtheme.cpp progressdispatcher.cpp propagatorjobs.cpp + propagatecommonzsync.cpp propagatedownload.cpp + propagatedownloadzsync.cpp propagateupload.cpp propagateuploadv1.cpp propagateuploadng.cpp @@ -62,6 +64,40 @@ else() set (libsync_SRCS ${libsync_SRCS} creds/httpcredentials.cpp) endif() +## begin zsync + +include_directories( ${CMAKE_SOURCE_DIR}/src/3rdparty/zsync/c ) + +set( libsync_SRCS + ${libsync_SRCS} + ../3rdparty/zsync/c/librcksum/hash.c + ../3rdparty/zsync/c/librcksum/md4.c + ../3rdparty/zsync/c/librcksum/range.c + ../3rdparty/zsync/c/librcksum/rsum.c + ../3rdparty/zsync/c/librcksum/state.c + ../3rdparty/zsync/c/libzsync/sha1.c + ../3rdparty/zsync/c/libzsync/zsync.c + ../3rdparty/zsync/c/libzsync/zsyncfile.c + ../3rdparty/zsync/c/progress.c +) + +if ( WIN32 ) + # ntohs + list(APPEND OS_SPECIFIC_LINK_LIBRARIES + ws2_32 + ) + # ensure size_t is 64 bits + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FILE_OFFSET_BITS=64") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_FILE_OFFSET_BITS=64") +endif() + +set_source_files_properties( ../3rdparty/zsync/c/libzsync/zsync.c + PROPERTIES COMPILE_FLAGS -DVERSION=\\"0.6.3\\" ) +set_source_files_properties( ../3rdparty/zsync/c/libzsync/zsyncfile.c + PROPERTIES COMPILE_FLAGS "-DVERSION=\\\"0.6.3\\\" -DSIZEOF_OFF_T=8" ) + +## end zsync + # These headers are installed for libowncloudsync to be used by 3rd party apps set(owncloudsync_HEADERS account.h |