diff options
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9acff487a..0a6d72de1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -43,7 +43,6 @@ set(3rdparty_INC ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qtsingleapplication ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/QProgressIndicator ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/fancylineedit - ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/csync ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qjson ) @@ -160,17 +159,10 @@ IF (NOT APPLE) ) ENDIF(NOT APPLE) -IF( DEFINED CSYNC_BUILD_PATH ) -SET(HTTPBF_LIBRARY ${CSYNC_BUILD_PATH}/src/httpbf/libhttpbf.a) -ELSE() -FIND_LIBRARY(HTTPBF_LIBRARY NAMES httpbf HINTS $ENV{CSYNC_DIR}) -ENDIF() - - list(APPEND libsync_LINK_TARGETS ${QT_LIBRARIES} - ${CSYNC_LIBRARY} - ${HTTPBF_LIBRARY} + ocsync + httpbf ) IF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") @@ -302,7 +294,7 @@ if( UNIX AND NOT APPLE) endif() # csync is required. -include_directories(${CSYNC_INCLUDE_DIR}/csync ${CSYNC_INCLUDE_DIR} ${CSYNC_INCLUDE_DIR}/httpbf/src ${CSYNC_BUILD_PATH}/src) +include_directories(../csync/src ../csync/src/httpbf/src ${CMAKE_CURRENT_BINARY_DIR}/../csync ${CMAKE_CURRENT_BINARY_DIR}/../csync/src ) include_directories(${3rdparty_INC}) qt_wrap_cpp(mirallMoc ${mirall_HEADERS}) @@ -385,7 +377,6 @@ set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES ) target_link_libraries( ${APPLICATION_EXECUTABLE} ${QT_LIBRARIES} ) target_link_libraries( ${APPLICATION_EXECUTABLE} ${synclib_NAME} ) -target_link_libraries( ${APPLICATION_EXECUTABLE} ${CSYNC_LIBRARY} ) install(TARGETS ${APPLICATION_EXECUTABLE} RUNTIME DESTINATION bin @@ -418,7 +409,6 @@ qt5_use_modules(${owncloudcmd_NAME} Network Sql) set_target_properties(${owncloudcmd_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY} ) target_link_libraries(${owncloudcmd_NAME} ${synclib_NAME}) -target_link_libraries(${owncloudcmd_NAME} ${CSYNC_LIBRARY}) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/mirall) install(TARGETS ${owncloudcmd_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} |