diff options
Diffstat (limited to '.gitlab/ci')
-rw-r--r-- | .gitlab/ci/configure_fedora31_common.cmake | 4 | ||||
-rw-r--r-- | .gitlab/ci/configure_fedora31_makefiles.cmake | 2 | ||||
-rw-r--r-- | .gitlab/ci/configure_fedora31_ninja.cmake | 2 | ||||
-rw-r--r-- | .gitlab/ci/configure_fedora31_ninja_multi.cmake | 1 | ||||
-rw-r--r-- | .gitlab/ci/configure_fedora31_tidy.cmake | 2 | ||||
-rwxr-xr-x | .gitlab/ci/docker/fedora31/install_deps.sh | 6 |
6 files changed, 12 insertions, 5 deletions
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_ninja_multi.cmake b/.gitlab/ci/configure_fedora31_ninja_multi.cmake new file mode 100644 index 0000000..20863a2 --- /dev/null +++ b/.gitlab/ci/configure_fedora31_ninja_multi.cmake @@ -0,0 +1 @@ +include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.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") diff --git a/.gitlab/ci/docker/fedora31/install_deps.sh b/.gitlab/ci/docker/fedora31/install_deps.sh index bcb1564..0d857c1 100755 --- a/.gitlab/ci/docker/fedora31/install_deps.sh +++ b/.gitlab/ci/docker/fedora31/install_deps.sh @@ -1,8 +1,10 @@ #!/bin/sh # Install build requirements. -dnf install -y \ - openssl-devel +dnf install --setopt=install_weak_deps=False -y \ + ncurses-devel \ + openssl-devel \ + qt5-qtbase-devel # Install development tools. dnf install --setopt=install_weak_deps=False -y \ |