Move new password functions into tlsutility

[icinga2] / icinga-installer / CMakeLists.txt

diff --git a/icinga-installer/CMakeLists.txt b/icinga-installer/CMakeLists.txt
index 967e65cca5dd83c8d51443934f0e6aaad5905506..7770b6d8642204cc3ed6709927ef6a28349a4469 100644 (file)
--- a/icinga-installer/CMakeLists.txt
+++ b/icinga-installer/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Icinga 2
-# Copyright (C) 2012-2016 Icinga Development Team (https://www.icinga.org/)
+# Copyright (C) 2012-2017 Icinga Development Team (https://www.icinga.com/)
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -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(