From 1e8ecfccdd6faf5c46e933cf21209bb5885694a2 Mon Sep 17 00:00:00 2001
From: Ben Boeckel <ben.boeckel@kitware.com>
Date: Mon, 1 Jun 2020 06:51:58 -0400
Subject: gitlab-ci: also build ncurses and Qt code on Linux

---
 .gitlab-ci.yml                                | 8 ++++----
 .gitlab/ci/configure_fedora31_common.cmake    | 4 ++++
 .gitlab/ci/configure_fedora31_makefiles.cmake | 2 +-
 .gitlab/ci/configure_fedora31_ninja.cmake     | 2 +-
 .gitlab/ci/configure_fedora31_tidy.cmake      | 2 +-
 5 files changed, 11 insertions(+), 7 deletions(-)
 create mode 100644 .gitlab/ci/configure_fedora31_common.cmake

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e7440f2..0a7c98a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,7 +14,7 @@
     - when: never
 
 .fedora31: &fedora31
-    image: "kitware/cmake:ci-fedora31-x86_64-2020-05-08"
+    image: "kitware/cmake:ci-fedora31-x86_64-2020-06-01"
 
     variables:
         GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
@@ -321,7 +321,7 @@ build:fedora31-tidy:
     <<:
         - *fedora31_tidy
         - *cmake_build_unix
-        - *linux_builder_tags
+        - *linux_builder_tags_qt
     rules: *rules_settings
 
 build:fedora31-sphinx:
@@ -336,7 +336,7 @@ build:fedora31-ninja:
         - *fedora31_ninja
         - *cmake_build_unix
         - *cmake_build_artifacts
-        - *linux_builder_tags
+        - *linux_builder_tags_qt
     rules: *manual_rules_settings
 
 test:fedora31-ninja:
@@ -355,7 +355,7 @@ build:fedora31-makefiles:
         - *fedora31_makefiles
         - *cmake_build_unix
         - *cmake_build_artifacts
-        - *linux_builder_tags
+        - *linux_builder_tags_qt
     rules: *manual_rules_settings
 
 test:fedora31-makefiles:
diff --git a/.gitlab/ci/configure_fedora31_common.cmake b/.gitlab/ci/configure_fedora31_common.cmake
new file mode 100644
index 0000000..dc068d5
--- /dev/null
+++ b/.gitlab/ci/configure_fedora31_common.cmake
@@ -0,0 +1,4 @@
+set(BUILD_CursesDialog ON CACHE BOOL "")
+set(BUILD_QtDialog ON CACHE BOOL "")
+
+include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake")
diff --git a/.gitlab/ci/configure_fedora31_makefiles.cmake b/.gitlab/ci/configure_fedora31_makefiles.cmake
index 33f0db0..74768b7 100644
--- a/.gitlab/ci/configure_fedora31_makefiles.cmake
+++ b/.gitlab/ci/configure_fedora31_makefiles.cmake
@@ -1 +1 @@
-include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora31_common.cmake")
diff --git a/.gitlab/ci/configure_fedora31_ninja.cmake b/.gitlab/ci/configure_fedora31_ninja.cmake
index 33f0db0..74768b7 100644
--- a/.gitlab/ci/configure_fedora31_ninja.cmake
+++ b/.gitlab/ci/configure_fedora31_ninja.cmake
@@ -1 +1 @@
-include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora31_common.cmake")
diff --git a/.gitlab/ci/configure_fedora31_tidy.cmake b/.gitlab/ci/configure_fedora31_tidy.cmake
index f41ad82..55d022c 100644
--- a/.gitlab/ci/configure_fedora31_tidy.cmake
+++ b/.gitlab/ci/configure_fedora31_tidy.cmake
@@ -1,3 +1,3 @@
 set(CMake_RUN_CLANG_TIDY ON CACHE BOOL "")
 
-include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora31_common.cmake")
-- 
cgit v0.12