Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Schmidt <domme@tomahawk-player.org>2014-08-30 16:45:39 +0400
committerDominik Schmidt <domme@tomahawk-player.org>2014-08-30 16:45:39 +0400
commit7ad557f2f8d614e2fd53f26e483d337c0a789da4 (patch)
tree87bb05994c177dd624a497ac80300959dc79b33a /src/crashreporter
parentef70052b0ecd1010ebab71de01acada41bb86188 (diff)
Add crash reporter to osx package and don't build it with BUILD_LIBRARIES_ONLY enabled
Diffstat (limited to 'src/crashreporter')
-rw-r--r--src/crashreporter/CMakeLists.txt45
1 files changed, 26 insertions, 19 deletions
diff --git a/src/crashreporter/CMakeLists.txt b/src/crashreporter/CMakeLists.txt
index 25f385ad5..dbdb48cbb 100644
--- a/src/crashreporter/CMakeLists.txt
+++ b/src/crashreporter/CMakeLists.txt
@@ -23,24 +23,31 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}
"../3rdparty/libcrashreporter-qt/src/"
)
-add_executable( ${CRASHREPORTER_EXECUTABLE} WIN32
- ${crashreporter_SOURCES}
- ${crashreporter_HEADERS_MOC}
- ${crashreporter_UI_HEADERS}
- ${crashreporter_RC_RCC}
-)
-
-target_link_libraries( ${CRASHREPORTER_EXECUTABLE}
- crashreporter-gui
- ${QT_LIBRARIES}
-)
-
-#TODO: don't use automoc :-(
-set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES AUTOMOC ON)
-set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY} )
-if(NOT WIN32)
- install(TARGETS ${CRASHREPORTER_EXECUTABLE} RUNTIME DESTINATION ${LIBEXEC_INSTALL_DIR})
+if(NOT BUILD_LIBRARIES_ONLY)
+ add_executable( ${CRASHREPORTER_EXECUTABLE} WIN32
+ ${crashreporter_SOURCES}
+ ${crashreporter_HEADERS_MOC}
+ ${crashreporter_UI_HEADERS}
+ ${crashreporter_RC_RCC}
+ )
+
+ qt5_use_modules(${CRASHREPORTER_EXECUTABLE} Widgets Network)
+
+ set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES AUTOMOC ON)
+ set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY} )
+ set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES INSTALL_RPATH "${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
+ target_link_libraries(${CRASHREPORTER_EXECUTABLE}
+ crashreporter-gui
+ ${QT_LIBRARIES}
+ )
+
+ if(BUILD_OWNCLOUD_OSX_BUNDLE)
+ install(TARGETS ${CRASHREPORTER_EXECUTABLE} DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/MacOS)
+ elseif(NOT BUILD_LIBRARIES_ONLY)
+ install(TARGETS ${CRASHREPORTER_EXECUTABLE}
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ endif()
endif()
-
-qt5_use_modules(${CRASHREPORTER_EXECUTABLE} Widgets Network)