diff options
| author | Daniel Molkentin <danimo@owncloud.com> | 2015-08-06 12:11:52 +0300 |
|---|---|---|
| committer | Daniel Molkentin <danimo@owncloud.com> | 2015-08-06 12:11:52 +0300 |
| commit | 72b2c52e15a5f0b0d901b82d07fe2935790d4ee6 (patch) | |
| tree | e4c6ef559b22fa895a4675ebc414051572092f15 /test/CMakeLists.txt | |
| parent | 2a22cec442d29b20e74b7de9dfd530ac26064cc9 (diff) | |
| parent | 6e32c2c14ed692d58694b33344ff6ee6e3f93b29 (diff) | |
Merge branch 'master' into linux_restart_on_new_version
Conflicts:
src/gui/application.cpp
src/gui/owncloudsetupwizard.cpp
Diffstat (limited to 'test/CMakeLists.txt')
| -rw-r--r-- | test/CMakeLists.txt | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index cff057e77..9a1cb2fd7 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -18,6 +18,7 @@ list(APPEND FolderWatcher_SRC ../src/gui/folderwatcher_win.cpp) ENDIF() IF( APPLE ) list(APPEND FolderWatcher_SRC ../src/gui/folderwatcher_mac.cpp) +list(APPEND FolderWatcher_SRC ../src/gui/socketapisocket_mac.mm) ENDIF() owncloud_add_test(FolderWatcher "${FolderWatcher_SRC}") @@ -43,8 +44,21 @@ SET(FolderMan_SRC ../src/gui/folderman.cpp) list(APPEND FolderMan_SRC ../src/gui/folder.cpp ) list(APPEND FolderMan_SRC ../src/gui/socketapi.cpp ) list(APPEND FolderMan_SRC ../src/gui/accountstate.cpp ) +#list(APPEND FolderMan_SRC ../src/gui/accountmanager.cpp ) +#list(APPEND FolderMan_SRC ../src/gui/proxyauthhandler.cpp ) +#list(APPEND FolderMan_SRC ../src/gui/proxyauthdialog.cpp ) +#list(APPEND FolderMan_SRC ../src/gui/creds/shibbolethcredentials.cpp ) +#list(APPEND FolderMan_SRC ../src/gui/creds/credentialsfactory.cpp ) +#list(APPEND FolderMan_SRC ../src/gui/creds/shibboleth/shibbolethuserjob.cpp ) +#list(APPEND FolderMan_SRC ../src/gui/creds/shibboleth/shibbolethrefresher.cpp ) +#list(APPEND FolderMan_SRC ../src/gui/creds/shibboleth/shibbolethwebview.cpp ) +#list(APPEND FolderMan_SRC ../src/gui/creds/httpcredentialsgui.cpp ) +#list(APPEND FolderMan_SRC ../src/gui/sslerrordialog.cpp ) list(APPEND FolderMan_SRC ../src/gui/syncrunfilelog.cpp ) list(APPEND FolderMan_SRC ${FolderWatcher_SRC}) list(APPEND FolderMan_SRC stub.cpp ) +#include_directories(${QTKEYCHAIN_INCLUDE_DIR}) +#include_directories(${CMAKE_BINARY_DIR}/src/gui) +#include_directories(${CMAKE_SOURCE_DIR}/src/3rdparty/qjson) owncloud_add_test(FolderMan "${FolderMan_SRC}") |