Browse Source

ci: Factor out Windows x86-family-specific package configuration

Brad King 3 years ago
parent
commit
cca3a73ef0

+ 1 - 0
.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")

+ 1 - 14
.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 "")

+ 13 - 0
.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 "")

+ 1 - 0
.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")