summaryrefslogtreecommitdiffstats
path: root/.gitlab
diff options
context:
space:
mode:
authorBen Boeckel <ben.boeckel@kitware.com>2020-06-10 16:09:41 (GMT)
committerBen Boeckel <ben.boeckel@kitware.com>2020-06-10 19:57:16 (GMT)
commit881c0b86ddeac5e9aaa5b4e438821f5e33398f0b (patch)
treea3affe888f25d5a5606a2ac13ef83f9189fe19f0 /.gitlab
parentb8d46d5e505d1942dadab63ad31e7be4147382f5 (diff)
downloadCMake-881c0b86ddeac5e9aaa5b4e438821f5e33398f0b.zip
CMake-881c0b86ddeac5e9aaa5b4e438821f5e33398f0b.tar.gz
CMake-881c0b86ddeac5e9aaa5b4e438821f5e33398f0b.tar.bz2
gitlab-ci: test QtDialog on Windows
Diffstat (limited to '.gitlab')
-rw-r--r--.gitlab/ci/configure_windows_common.cmake4
-rw-r--r--.gitlab/ci/configure_windows_vs2019_x64_ninja.cmake2
2 files changed, 5 insertions, 1 deletions
diff --git a/.gitlab/ci/configure_windows_common.cmake b/.gitlab/ci/configure_windows_common.cmake
new file mode 100644
index 0000000..45250ac
--- /dev/null
+++ b/.gitlab/ci/configure_windows_common.cmake
@@ -0,0 +1,4 @@
+set(BUILD_QtDialog ON CACHE BOOL "")
+set(CMAKE_PREFIX_PATH "$ENV{CI_PROJECT_DIR}/.gitlab/qt" CACHE STRING "")
+
+include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake")
diff --git a/.gitlab/ci/configure_windows_vs2019_x64_ninja.cmake b/.gitlab/ci/configure_windows_vs2019_x64_ninja.cmake
index e2f00dd..719c93c 100644
--- a/.gitlab/ci/configure_windows_vs2019_x64_ninja.cmake
+++ b/.gitlab/ci/configure_windows_vs2019_x64_ninja.cmake
@@ -1,3 +1,3 @@
set(CMake_TEST_WIX_NO_VERIFY "ON" CACHE BOOL "")
-include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_common.cmake")