Package installer if it was built

CPackOptions.cmake.in

@@ -17,6 +17,8 @@ else ()
      include ( "${CMAKE_SOURCE_DIR}/OWNCLOUD.cmake" )
 endif()
 
+set( CRASHREPORTER_EXECUTABLE @CRASHREPORTER_EXECUTABLE@)
+
 set( BUILD_OWNCLOUD_OSX_BUNDLE @BUILD_OWNCLOUD_OSX_BUNDLE@)
 if(APPLE AND NOT BUILD_OWNCLOUD_OSX_BUNDLE)
     message( FATAL_ERROR "You're trying to build a bundle although you haven't built mirall in bundle mode.\n Add -DBUILD_OWNCLOUD_OSX_BUNDLE=ON")

cmake/modules/NSIS.template.in

@@ -9,6 +9,8 @@
 !define APPLICATION_LICENSE "@APPLICATION_LICENSE@"
 !define WIN_SETUP_BITMAP_PATH "@WIN_SETUP_BITMAP_PATH@"
 
+!define CRASHREPORTER_EXECUTABLE "@CRASHREPORTER_EXECUTABLE@"
+
 ;-----------------------------------------------------------------------------
 ; Some installer script options (comment-out options not required)
 ;-----------------------------------------------------------------------------
@@ -393,6 +395,9 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION
    File "${MING_SHARE}\qt5\translations\qt_??_??.qm"
    File "${MING_SHARE}\qt5\translations\qtkeychain_*.qm"
 
+   ;Add crash reporter if it was built
+   File /nonfatal "${BUILD_PATH}/bin/${CRASHREPORTER_EXECUTABLE}.exe"
+
    SetOutPath "$INSTDIR\platforms"
    File "${PLATFORMS_DLL_PATH}\qwindows.dll"
    SetOutPath "$INSTDIR\accessible"

src/crashreporter/CMakeLists.txt

@@ -39,6 +39,8 @@ target_link_libraries( ${CRASHREPORTER_EXECUTABLE}
 #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} )
-install(TARGETS ${CRASHREPORTER_EXECUTABLE} RUNTIME DESTINATION ${LIBEXEC_INSTALL_DIR})
+if(NOT WIN32)
+    install(TARGETS ${CRASHREPORTER_EXECUTABLE} RUNTIME DESTINATION ${LIBEXEC_INSTALL_DIR})
+endif()
 
 qt5_use_modules(${CRASHREPORTER_EXECUTABLE} Widgets Network)