diff options
| author | Daniel Molkentin <danimo@owncloud.com> | 2012-10-10 16:00:46 +0400 |
|---|---|---|
| committer | Daniel Molkentin <danimo@owncloud.com> | 2012-10-10 16:04:24 +0400 |
| commit | d599c4532c3e33f8f1eef7d5236168835b0414b8 (patch) | |
| tree | de68d5003597afca44180d64d4007b73d80ec15d /cmake | |
| parent | 824368e5049108538ad5bb444a4b478a61bb697a (diff) | |
replace relative csync buildir detection magic
If you do not want to run make install for lib(o)csync,
pass -DCSYNC_LIBRARY_PATH=$your_csync_builddir
and -DCSYNC_INCLUDE_PATH=$your_csync_srcdir/src
to cmake when building mirall.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindCsync.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmake/modules/FindCsync.cmake b/cmake/modules/FindCsync.cmake index 5b0bf6387..2d66f6e21 100644 --- a/cmake/modules/FindCsync.cmake +++ b/cmake/modules/FindCsync.cmake @@ -4,11 +4,11 @@ ELSE() FIND_PATH(CSYNC_INCLUDE_PATH NAMES csync.h HINTS $ENV{CSYNC_DIR} ) ENDIF() -IF(EXISTS "${CMAKE_SOURCE_DIR}/../buildcsync/src/") +IF( DEFINED CSYNC_LIBRARY_PATH AND DEFINED CSYNC_INCLUDE_PATH ) IF( WIN32 ) - SET(CSYNC_LIBRARY ${CMAKE_SOURCE_DIR}/../win/buildcsync/src/libocsync.dll) + SET(CSYNC_LIBRARY ${CMAKE_SOURCE_DIR}/src/libocsync.dll) ELSE( WIN32 ) - SET(CSYNC_LIBRARY ${CMAKE_SOURCE_DIR}/../buildcsync/src/libocsync.so) + SET(CSYNC_LIBRARY ${CSYNC_LIBRARY}/src/libocsync.so) ENDIF( WIN32 ) ELSE() FIND_LIBRARY(CSYNC_LIBRARY NAMES ocsync HINTS $ENV{CSYNC_DIR}) |