mirror of
https://github.com/nextcloud/desktop.git
synced 2024-10-24 13:25:52 +03:00
0589bfc51b
This just fix the conflict. Do not compile or work yet Conflicts: src/CMakeLists.txt src/mirall/csyncthread.cpp src/mirall/csyncthread.h src/mirall/owncloudfolder.cpp src/mirall/syncfileitem.h test/CMakeLists.txt
6 lines
278 B
CMake
6 lines
278 B
CMake
include_directories(${CMAKE_CURRENT_LIST_DIR}/../src)
|
|
include_directories(${CSYNC_INCLUDE_DIR}/csync ${CSYNC_INCLUDE_DIR} ${CSYNC_INCLUDE_DIR}/httpbf/src ${CSYNC_BUILD_PATH}/src)
|
|
include(owncloud_add_test.cmake)
|
|
|
|
owncloud_add_test(OwncloudPropagator)
|
|
owncloud_add_test(Utility)
|