From fee9616708bccbe8f0dcf9b3398d7b2ca02fe3aa Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Wed, 10 Oct 2012 16:05:17 +0200 Subject: OS X: Remove "make install" requirment for csync --- src/CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9fecbc65e..067b6adf2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -203,7 +203,11 @@ else() set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES COMPILE_DEFINITIONS OWNCLOUD_CLIENT) #FIXME: hardcoded path - install(FILES /usr/local/lib/ocsync-0/ocsync_owncloud.so DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/Plugins) + if ( EXISTS ${CSYNC_BINARY_DIR}/modules/ocsync_owncloud.so ) + install(FILES ${CSYNC_BINARY_DIR}/modules/ocsync_owncloud.so DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/Plugins) + else() + install(FILES /usr/local/lib/ocsync-0/ocsync_owncloud.so DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/Plugins) + endif() install(FILES ${mirall_I18N} DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/translations) list(APPEND dirs "/usr/local/lib") -- cgit v1.2.3