Try to handle BUILD_LIBRARIES_ONLY correctly

Also, try to fix OS X build

CMakeLists.txt

@@ -59,9 +59,9 @@ set(DATADIR ${DATA_INSTALL_DIR})
 # BUILD_OWNCLOUD_OSX_BUNDLE was not initialized OR set to true on OSX
 if(APPLE AND (NOT DEFINED BUILD_OWNCLOUD_OSX_BUNDLE OR BUILD_OWNCLOUD_OSX_BUNDLE))
     set(BUILD_OWNCLOUD_OSX_BUNDLE ON)
-    set(OWNCLOUD_OSX_BUNDLE "${APPLICATION_EXECUTABLE}.app")
-    set(LIB_INSTALL_DIR "${APPLICATION_EXECUTABLE}.app/Contents/MacOS")
-    set(BIN_INSTALL_DIR "${APPLICATION_EXECUTABLE}.app/Contents/MacOS")
+    set(OWNCLOUD_OSX_BUNDLE "bin/${APPLICATION_EXECUTABLE}.app")
+    set(LIB_INSTALL_DIR "bin/${APPLICATION_EXECUTABLE}.app/Contents/MacOS")
+    set(BIN_INSTALL_DIR "bin/${APPLICATION_EXECUTABLE}.app/Contents/MacOS")
 
 # BUILD_OWNCLOUD_OSX_BUNDLE was disabled on OSX
 elseif(APPLE AND NOT BUILD_OWNCLOUD_OSX_BUNDLE)

src/CMakeLists.txt

@@ -4,8 +4,10 @@ set(BIN_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 set(synclib_NAME ${APPLICATION_EXECUTABLE}sync)
 
 add_subdirectory(libsync)
-add_subdirectory(gui)
-add_subdirectory(cmd)
+if (NOT BUILD_LIBRARIES_ONLY)
+    add_subdirectory(gui)
+    add_subdirectory(cmd)
+endif(NOT BUILD_LIBRARIES_ONLY)
 
 find_program(KRAZY2_EXECUTABLE krazy2)
 if(KRAZY2_EXECUTABLE)

src/cmd/CMakeLists.txt

@@ -29,7 +29,7 @@ if(NOT BUILD_LIBRARIES_ONLY)
 	target_link_libraries(${cmd_NAME} ${synclib_NAME})
 endif()
 
-if(BUILD_OWNCLOUD_OSX_BUNDLE AND NOT BUILD_LIBRARIES_ONLY)
+if(BUILD_OWNCLOUD_OSX_BUNDLE)
     install(TARGETS ${cmd_NAME} DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/MacOS)
 elseif(NOT BUILD_LIBRARIES_ONLY)
     install(TARGETS ${cmd_NAME}

src/gui/CMakeLists.txt

@@ -171,7 +171,7 @@ if (WITH_DBUS)
     set(ADDITIONAL_APP_MODULES DBus)
 endif(WITH_DBUS)
 
-if(NOT BUILD_OWNCLOUD_OSX_BUNDLE AND NOT BUILD_LIBRARIES_ONLY)
+if(NOT BUILD_OWNCLOUD_OSX_BUNDLE)
 
     if(NOT WIN32)
         file( GLOB _icons "${theme_dir}/colored/${ICON_APP_NAME}-icon-*.png" )
@@ -189,7 +189,7 @@ if(NOT BUILD_OWNCLOUD_OSX_BUNDLE AND NOT BUILD_LIBRARIES_ONLY)
     # add_executable( ${APPLICATION_EXECUTABLE} main.cpp ${final_src})
     add_executable( ${APPLICATION_EXECUTABLE} WIN32 main.cpp ${final_src})
     qt5_use_modules(${APPLICATION_EXECUTABLE} Widgets Network Xml WebKitWidgets Sql ${ADDITIONAL_APP_MODULES})
-elseif(NOT BUILD_LIBRARIES_ONLY)
+elseif()
     if (Qt5Core_FOUND)
         include(DeployQt5)
     else(Qt5Core_FOUND)
@@ -211,35 +211,33 @@ elseif(NOT BUILD_LIBRARIES_ONLY)
     install(FILES ${qtkeychain_I18N} DESTINATION ${QM_DIR})
 endif()
 
-if(NOT BUILD_LIBRARIES_ONLY)
-  add_library(updater STATIC ${updater_SRCS} ${updaterMoc})
-  target_link_libraries(updater ${synclib_NAME})
-  qt5_use_modules(updater Widgets Network Xml)
+add_library(updater STATIC ${updater_SRCS} ${updaterMoc})
+target_link_libraries(updater ${synclib_NAME})
+qt5_use_modules(updater Widgets Network Xml)
 
-  set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
-          RUNTIME_OUTPUT_DIRECTORY  ${BIN_OUTPUT_DIRECTORY}
-  )
-  set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
+set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
+        RUNTIME_OUTPUT_DIRECTORY  ${BIN_OUTPUT_DIRECTORY}
+)
+set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
 	  INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
 
-  target_link_libraries( ${APPLICATION_EXECUTABLE} ${QT_LIBRARIES} )
-  target_link_libraries( ${APPLICATION_EXECUTABLE} ${synclib_NAME} )
-  target_link_libraries( ${APPLICATION_EXECUTABLE} updater )
-  target_link_libraries( ${APPLICATION_EXECUTABLE} ${OS_SPECIFIC_LINK_LIBRARIES} )
+target_link_libraries( ${APPLICATION_EXECUTABLE} ${QT_LIBRARIES} )
+target_link_libraries( ${APPLICATION_EXECUTABLE} ${synclib_NAME} )
+target_link_libraries( ${APPLICATION_EXECUTABLE} updater )
+target_link_libraries( ${APPLICATION_EXECUTABLE} ${OS_SPECIFIC_LINK_LIBRARIES} )
 
-  install(TARGETS ${APPLICATION_EXECUTABLE}
-          RUNTIME DESTINATION bin
-          LIBRARY DESTINATION lib
-          ARCHIVE DESTINATION lib
-          BUNDLE  DESTINATION "."
+install(TARGETS ${APPLICATION_EXECUTABLE}
+        RUNTIME DESTINATION bin
+        LIBRARY DESTINATION lib
+        ARCHIVE DESTINATION lib
+        BUNDLE  DESTINATION "."
  )
-endif()
 
 
 #FIXME: find a nice solution to make the second if(BUILD_OWNCLOUD_OSX_BUNDLE) unnecessary
 # currently it needs to be done because the code right above needs to be executed no matter
 # if building a bundle or not and the install_qt4_executable needs to be called afterwards
-if(BUILD_OWNCLOUD_OSX_BUNDLE AND NOT BUILD_LIBRARIES_ONLY)
+if(BUILD_OWNCLOUD_OSX_BUNDLE)
     if(Qt5Core_FOUND)
         install_qt5_executable(${OWNCLOUD_OSX_BUNDLE} "qtaccessiblewidgets;qsqlite;qcocoa")
     else(Qt5Core_FOUND)