diff options
| author | Daniel Molkentin <danimo@owncloud.com> | 2014-08-26 13:29:42 +0400 |
|---|---|---|
| committer | Daniel Molkentin <danimo@owncloud.com> | 2014-08-26 13:29:42 +0400 |
| commit | 902bb7a198c2fcefaf2ac741efadfc10d891fac7 (patch) | |
| tree | 956fd1ebb6717878dfa1140084aab06b98fa8b1f /src/CMakeLists.txt | |
| parent | 4fc044d368b2fe54f153ff33d761428a6b8f595d (diff) | |
| parent | 03dc27a3271fff5bc8be06e1bd714fbf528a2d69 (diff) | |
Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir
Conflicts:
src/CMakeLists.txt
src/gui/accountsettings.cpp
src/gui/folderwizard.cpp
src/gui/settingsdialog.cpp
src/libsync/syncengine.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 094d08372..62875a07f 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 + mirall/discoveryphase.cpp + mirall/selectivesyncdialog.cpp set(BIN_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") set(synclib_NAME ${APPLICATION_EXECUTABLE}sync) |