From cca3a73ef065416c65fd162765252400def9fbcc Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Wed, 8 Jun 2022 16:22:56 -0400
Subject: ci: Factor out Windows x86-family-specific package configuration

---
 .gitlab/ci/configure_windows_i386_package.cmake       |  1 +
 .gitlab/ci/configure_windows_package_common.cmake     | 15 +--------------
 .gitlab/ci/configure_windows_package_common_x86.cmake | 13 +++++++++++++
 .gitlab/ci/configure_windows_x86_64_package.cmake     |  1 +
 4 files changed, 16 insertions(+), 14 deletions(-)
 create mode 100644 .gitlab/ci/configure_windows_package_common_x86.cmake

(limited to '.gitlab/ci')

diff --git a/.gitlab/ci/configure_windows_i386_package.cmake b/.gitlab/ci/configure_windows_i386_package.cmake
index 279f5cf7ce..65e1dcb345 100644
--- a/.gitlab/ci/configure_windows_i386_package.cmake
+++ b/.gitlab/ci/configure_windows_i386_package.cmake
@@ -6,4 +6,5 @@ set(CMAKE_C_FLAGS "-D_WIN32_WINNT=0x601 -DNTDDI_VERSION=0x06010000" CACHE STRING
 set(CMAKE_CXX_FLAGS "-GR -EHsc -D_WIN32_WINNT=0x601 -DNTDDI_VERSION=0x06010000" CACHE STRING "")
 set(CMAKE_EXE_LINKER_FLAGS "-machine:x86 -subsystem:console,6.01" CACHE STRING "")
 
+include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_package_common_x86.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_package_common.cmake")
diff --git a/.gitlab/ci/configure_windows_package_common.cmake b/.gitlab/ci/configure_windows_package_common.cmake
index cea0ba0041..46c0a3e75a 100644
--- a/.gitlab/ci/configure_windows_package_common.cmake
+++ b/.gitlab/ci/configure_windows_package_common.cmake
@@ -6,22 +6,9 @@ set(CMAKE_DOC_DIR "doc/cmake" CACHE STRING "")
 # Link C/C++ runtime library statically.
 set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>" CACHE STRING "")
 
-# Enable cmake-gui with static qt plugins
+# Enable cmake-gui.
 set(BUILD_QtDialog "TRUE" CACHE BOOL "")
 set(CMake_GUI_DISTRIBUTE_WITH_Qt_LGPL "3" CACHE STRING "")
-set(qt "$ENV{CI_PROJECT_DIR}/.gitlab/qt")
-set(CMake_QT_STATIC_QWindowsIntegrationPlugin_LIBRARIES
-  ${qt}/plugins/platforms/qwindows.lib
-  ${qt}/plugins/styles/qwindowsvistastyle.lib
-  ${qt}/lib/Qt5EventDispatcherSupport.lib
-  ${qt}/lib/Qt5FontDatabaseSupport.lib
-  ${qt}/lib/Qt5ThemeSupport.lib
-  ${qt}/lib/qtfreetype.lib
-  ${qt}/lib/qtlibpng.lib
-  imm32.lib
-  wtsapi32.lib
-  CACHE STRING "")
-set(CMAKE_PREFIX_PATH "${qt}" CACHE STRING "")
 
 # Disable ccmake.
 set(BUILD_CursesDialog "OFF" CACHE BOOL "")
diff --git a/.gitlab/ci/configure_windows_package_common_x86.cmake b/.gitlab/ci/configure_windows_package_common_x86.cmake
new file mode 100644
index 0000000000..a8b59283bd
--- /dev/null
+++ b/.gitlab/ci/configure_windows_package_common_x86.cmake
@@ -0,0 +1,13 @@
+set(qt "$ENV{CI_PROJECT_DIR}/.gitlab/qt")
+set(CMake_QT_STATIC_QWindowsIntegrationPlugin_LIBRARIES
+  ${qt}/plugins/platforms/qwindows.lib
+  ${qt}/plugins/styles/qwindowsvistastyle.lib
+  ${qt}/lib/Qt5EventDispatcherSupport.lib
+  ${qt}/lib/Qt5FontDatabaseSupport.lib
+  ${qt}/lib/Qt5ThemeSupport.lib
+  ${qt}/lib/qtfreetype.lib
+  ${qt}/lib/qtlibpng.lib
+  imm32.lib
+  wtsapi32.lib
+  CACHE STRING "")
+set(CMAKE_PREFIX_PATH "${qt}" CACHE STRING "")
diff --git a/.gitlab/ci/configure_windows_x86_64_package.cmake b/.gitlab/ci/configure_windows_x86_64_package.cmake
index b7bba8574e..3a141a7a7f 100644
--- a/.gitlab/ci/configure_windows_x86_64_package.cmake
+++ b/.gitlab/ci/configure_windows_x86_64_package.cmake
@@ -6,4 +6,5 @@ set(CMAKE_C_FLAGS "-D_WIN32_WINNT=0x601 -DNTDDI_VERSION=0x06010000" CACHE STRING
 set(CMAKE_CXX_FLAGS "-GR -EHsc -D_WIN32_WINNT=0x601 -DNTDDI_VERSION=0x06010000" CACHE STRING "")
 set(CMAKE_EXE_LINKER_FLAGS "-machine:x64 -subsystem:console,6.01" CACHE STRING "")
 
+include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_package_common_x86.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_package_common.cmake")
-- 
cgit v1.2.1