Move new password functions into tlsutility

[icinga2] / icinga-installer / CMakeLists.txt

diff --git a/icinga-installer/CMakeLists.txt b/icinga-installer/CMakeLists.txt
index 6751ed47baa4ece9b582e75a889f7107e258b8a4..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
@@ -25,7 +25,7 @@ endforeach(flag_var)
 
 add_executable(icinga-installer icinga-installer.cpp)
 
-set_target_properties (
+set_target_properties(
   icinga-installer PROPERTIES
   FOLDER Bin
   OUTPUT_NAME icinga2-installer
@@ -34,8 +34,21 @@ set_target_properties (
 
 target_link_libraries(icinga-installer shlwapi)
 
-get_property(ICINGA2_INSTALLER_TARGET TARGET icinga-installer PROPERTY LOCATION_Release)
-configure_file(icinga2.wixpatch.cmake ${CMAKE_CURRENT_BINARY_DIR}/icinga2.wixpatch @ONLY)
+install(CODE "
+  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(
+  GENERATE
+  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/icinga2.wixpatch.$<CONFIG>"
+  INPUT "${CMAKE_CURRENT_SOURCE_DIR}/icinga2.wixpatch.cmake"
+)
 
 set(InstallPath "${CMAKE_INSTALL_SBINDIR}")