Merge branch 'master' of github.com:owncloud/mirall

cmake/modules/FindCsync.cmake

@@ -4,12 +4,14 @@ 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)
-  ELSE( WIN32 )
-     SET(CSYNC_LIBRARY ${CMAKE_SOURCE_DIR}/../buildcsync/src/libocsync.so)
-  ENDIF( WIN32 )
+    SET(CSYNC_LIBRARY ${CSYNC_LIBRARY_PATH}/src/libocsync.dll)
+  ELSEIF ( APPLE )
+    SET(CSYNC_LIBRARY ${CSYNC_LIBRARY_PATH}/src/libocsync.dylib)
+  ELSE()
+    SET(CSYNC_LIBRARY ${CSYNC_LIBRARY_PATH}/src/libocsync.so)
+  ENDIF( )
 ELSE()
   FIND_LIBRARY(CSYNC_LIBRARY NAMES ocsync HINTS $ENV{CSYNC_DIR})
 ENDIF()