From bb261818f4a3374589694ebaf964a41321d876dc Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Thu, 7 Mar 2024 16:48:59 -0500
Subject: ci: Explicitly build WiX custom action in packaging jobs

Drop the environment-based heuristic.
---
 .gitlab/ci/configure_windows_package_common.cmake | 2 ++
 CMakeCPack.cmake                                  | 9 +++------
 CMakeCPackOptions.cmake.in                        | 4 ++--
 Utilities/CMakeLists.txt                          | 2 +-
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.gitlab/ci/configure_windows_package_common.cmake b/.gitlab/ci/configure_windows_package_common.cmake
index 541a541..11bfad5 100644
--- a/.gitlab/ci/configure_windows_package_common.cmake
+++ b/.gitlab/ci/configure_windows_package_common.cmake
@@ -19,6 +19,8 @@ set(CMake_TEST_Qt5 OFF CACHE BOOL "")
 set(CMake_TEST_Qt6 OFF CACHE BOOL "")
 set(Python_FIND_REGISTRY NEVER CACHE STRING "")
 
+set(CMake_BUILD_WIX_CUSTOM_ACTION ON CACHE BOOL "")
+
 set(CMake_CPACK_CUSTOM_SCRIPT "${CMAKE_CURRENT_LIST_DIR}/CMakeCPack.cmake" CACHE FILEPATH "")
 
 include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake")
diff --git a/CMakeCPack.cmake b/CMakeCPack.cmake
index 798affd..a0c0e54 100644
--- a/CMakeCPack.cmake
+++ b/CMakeCPack.cmake
@@ -229,15 +229,12 @@ endif()
 
 set(CPACK_WIX_UPGRADE_GUID "8ffd1d72-b7f1-11e2-8ee5-00238bca4991")
 
-if(MSVC AND NOT "$ENV{WIX}" STREQUAL "")
-  set(WIX_CUSTOM_ACTION_ENABLED TRUE)
+if(CMake_BUILD_WIX_CUSTOM_ACTION)
   if(CMAKE_CONFIGURATION_TYPES)
-    set(WIX_CUSTOM_ACTION_MULTI_CONFIG TRUE)
+    set(CMake_BUILD_WIX_CUSTOM_ACTION_MULTI_CONFIG TRUE)
   else()
-    set(WIX_CUSTOM_ACTION_MULTI_CONFIG FALSE)
+    set(CMake_BUILD_WIX_CUSTOM_ACTION_MULTI_CONFIG FALSE)
   endif()
-else()
-  set(WIX_CUSTOM_ACTION_ENABLED FALSE)
 endif()
 
 # Set the options file that needs to be included inside CMakeCPackOptions.cmake
diff --git a/CMakeCPackOptions.cmake.in b/CMakeCPackOptions.cmake.in
index 7aacf8e..00ffe5e 100644
--- a/CMakeCPackOptions.cmake.in
+++ b/CMakeCPackOptions.cmake.in
@@ -268,14 +268,14 @@ if("${CPACK_GENERATOR}" STREQUAL "WIX")
     "@CMake_SOURCE_DIR@/Utilities/Release/WiX/cmake_extra_dialog.wxs"
   )
 
-  set(_WIX_CUSTOM_ACTION_ENABLED "@WIX_CUSTOM_ACTION_ENABLED@")
+  set(_WIX_CUSTOM_ACTION_ENABLED "@CMake_BUILD_WIX_CUSTOM_ACTION@")
   if(_WIX_CUSTOM_ACTION_ENABLED)
     list(APPEND CPACK_WIX_EXTRA_SOURCES
       "@CMake_SOURCE_DIR@/Utilities/Release/WiX/cmake_nsis_overwrite_dialog.wxs"
       )
     list(APPEND CPACK_WIX_CANDLE_EXTRA_FLAGS -dCHECK_NSIS=1)
 
-    set(_WIX_CUSTOM_ACTION_MULTI_CONFIG "@WIX_CUSTOM_ACTION_MULTI_CONFIG@")
+    set(_WIX_CUSTOM_ACTION_MULTI_CONFIG "@CMake_BUILD_WIX_CUSTOM_ACTION_MULTI_CONFIG@")
     if(_WIX_CUSTOM_ACTION_MULTI_CONFIG)
       if(CPACK_BUILD_CONFIG)
         set(_WIX_CUSTOM_ACTION_CONFIG "${CPACK_BUILD_CONFIG}")
diff --git a/Utilities/CMakeLists.txt b/Utilities/CMakeLists.txt
index 2a8c855..5e6ef0a 100644
--- a/Utilities/CMakeLists.txt
+++ b/Utilities/CMakeLists.txt
@@ -13,7 +13,7 @@ else()
   add_subdirectory(Sphinx)
 endif()
 
-if(WIX_CUSTOM_ACTION_ENABLED)
+if(CMake_BUILD_WIX_CUSTOM_ACTION)
   add_subdirectory(Release/WiX)
 endif()
 
-- 
cgit v0.12