diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2014-11-08 12:48:36 +0300 |
|---|---|---|
| committer | Olivier Goffart <ogoffart@woboq.com> | 2014-11-08 12:48:36 +0300 |
| commit | de11f602d56728f78cb3cadccf9ce9d6bc0d1906 (patch) | |
| tree | 18c9d86d59f2957e465064981258ed389200afb4 /src/CMakeLists.txt | |
| parent | f25d175b5d4494f6c1cd5c81c46cf6627f55c51a (diff) | |
| parent | 8febd90f2a984641d9004db57a5373bc7b4e3e43 (diff) | |
Merge remote-tracking branch 'origin/il'
Conflicts:
csync/src/csync_private.h
src/CMakeLists.txt
src/gui/folder.cpp
src/libsync/owncloudpropagator.cpp
src/libsync/owncloudpropagator.h
src/libsync/propagator_qnam.cpp
src/libsync/propagator_qnam.h
src/libsync/syncengine.cpp
src/libsync/syncengine.h
src/mirall/syncjournaldb.cpp
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 094d08372..f902336c9 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,7 @@ # TODO: OSX and LIB_ONLY seem to require this to go to binary dir only + mirall/bandwidthmanager.cpp +if(NOT TOKEN_AUTH_ONLY) +endif() set(BIN_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") set(synclib_NAME ${APPLICATION_EXECUTABLE}sync) |