Fix include for icinga2.wixpatch (again)

refs #11449

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f64ddee4eb41f55496630911c657616c644c0b60..09d6da84060503472715de53e165b2369be2896b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -306,6 +306,8 @@ set(CPACK_WIX_UPGRADE_GUID "52F2BEAA-4DF0-4C3E-ABDC-C0F61DE4DF8A")
 set(CPACK_WIX_EXTENSIONS "WixUtilExtension")
 set(CPACK_WIX_UI_BANNER "${CMAKE_CURRENT_SOURCE_DIR}/icinga-installer/bannrbmp.bmp")
 set(CPACK_WIX_UI_DIALOG "${CMAKE_CURRENT_SOURCE_DIR}/icinga-installer/dlgbmp.bmp")
+set(CPACK_WIX_PATCH_FILE "${CMAKE_CURRENT_BINARY_DIR}/icinga-installer/icinga2.wixpatch.Debug")
+set(CPACK_WIX_PATCH_FILE "${CMAKE_CURRENT_BINARY_DIR}/icinga-installer/icinga2.wixpatch")
 
 set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE)
 include(InstallRequiredSystemLibraries)

diff --git a/icinga-installer/CMakeLists.txt b/icinga-installer/CMakeLists.txt
index 967e65cca5dd83c8d51443934f0e6aaad5905506..0c32bade35180c04c678d7ea0d984f94366adaf8 100644 (file)
--- a/icinga-installer/CMakeLists.txt
+++ b/icinga-installer/CMakeLists.txt
@@ -35,7 +35,13 @@ set_target_properties(
 target_link_libraries(icinga-installer shlwapi)
 
 install(CODE "
-set(CPACK_WIX_PATCH_FILE \"\${CMAKE_CURRENT_BINARY_DIR}/icinga-installer/icinga2.wixpatch.\${BUILD_TYPE}\")
+  execute_process(COMMAND \${CMAKE_COMMAND} -E copy \"${CMAKE_CURRENT_BINARY_DIR}/icinga2.wixpatch.\${BUILD_TYPE}\"
+                  \"${CMAKE_CURRENT_BINARY_DIR}/icinga2.wixpatch\"
+                  RESULT_VARIABLE copy_result
+                  ERROR_VARIABLE error_output)
+  if(copy_result)
+    message(FATAL_ERROR \${error_output})
+  endif()
 ")
 
 file(