diff --git a/CMakeLists.txt b/CMakeLists.txt index 52c698bb0..761feb5c0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -318,7 +318,8 @@ 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) +set(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION "sbin") +set(CMAKE_INSTALL_UCRT_LIBRARIES TRUE) include(InstallRequiredSystemLibraries) if(WIN32) @@ -352,8 +353,7 @@ if(WIN32) endif() install( - PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} - ${ICINGA2_OPENSSL_DLLS} + PROGRAMS ${ICINGA2_OPENSSL_DLLS} DESTINATION ${CMAKE_INSTALL_SBINDIR} ) endif() diff --git a/icinga-installer/icinga2.wixpatch.cmake b/icinga-installer/icinga2.wixpatch.cmake index 099d940c4..0666261d2 100644 --- a/icinga-installer/icinga2.wixpatch.cmake +++ b/icinga-installer/icinga2.wixpatch.cmake @@ -10,9 +10,6 @@ - - - $CM_CP_sbin.icinga2_installer.exe>2 $CM_CP_sbin.icinga2_installer.exe>2 $CM_CP_sbin.icinga2_installer.exe=2 @@ -32,15 +29,5 @@ Event="DoAction" Value="LaunchIcinga2Wizard">WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed - - - - - - - -