diff options
| author | Daniel Molkentin <danimo@owncloud.com> | 2014-11-12 01:53:38 +0300 |
|---|---|---|
| committer | Daniel Molkentin <danimo@owncloud.com> | 2014-11-12 01:53:38 +0300 |
| commit | cdac8d56d5bde3dcd4265603998293261804f7bb (patch) | |
| tree | aed5da63cd8e1303e3d801b8944d6f51fb23b6c9 /src/CMakeLists.txt | |
| parent | 7ad557f2f8d614e2fd53f26e483d337c0a789da4 (diff) | |
| parent | 7b4be209aaefe289f96db0b492414cbad1e6dfea (diff) | |
Merge remote-tracking branch 'origin/master' into crashreporter
Conflicts:
src/libsync/utility.cpp
src/libsync/utility.h
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ff039b1a7..311ccd20a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,6 @@ # TODO: OSX and LIB_ONLY seem to require this to go to binary dir only +if(NOT TOKEN_AUTH_ONLY) +endif() set(BIN_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") set(synclib_NAME ${APPLICATION_EXECUTABLE}sync) |