diff options
| author | Brad King <brad.king@kitware.com> | 2020-09-24 19:15:11 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-09-24 19:15:19 (GMT) |
| commit | 0ff74958f4b0e8ea7b27cf706af55e6192481985 (patch) | |
| tree | 4d3c7c6605de0501a764cfa716814883417d74e0 /.gitlab | |
| parent | 4ae8cc7f0bc0ce95bc2a719bb13e4d19a0cd49ed (diff) | |
| parent | 1dcc5698289a49359c70f022d673cacc42b82239 (diff) | |
| download | CMake-0ff74958f4b0e8ea7b27cf706af55e6192481985.zip CMake-0ff74958f4b0e8ea7b27cf706af55e6192481985.tar.gz CMake-0ff74958f4b0e8ea7b27cf706af55e6192481985.tar.bz2 | |
Merge topic 'cmake-gui-tests'
1dcc569828 gitlab-ci: Add GUI testing to each OS
4c6e5cd0fa Tests: Add some basic tests for CMake GUI
41e223deb3 CMake GUI: Split up into libraries, add test shim
b7995b62f0 QCMakeCacheView: Default to nullptr for parent
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5224
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/artifacts.yml | 1 | ||||
| -rw-r--r-- | .gitlab/ci/configure_fedora31_ninja.cmake | 1 | ||||
| -rw-r--r-- | .gitlab/ci/configure_macos_common.cmake | 6 | ||||
| -rw-r--r-- | .gitlab/ci/configure_macos_makefiles.cmake | 1 | ||||
| -rw-r--r-- | .gitlab/ci/configure_macos_ninja.cmake | 1 | ||||
| -rw-r--r-- | .gitlab/ci/configure_windows_vs2019_x64_ninja.cmake | 1 | ||||
| -rw-r--r-- | .gitlab/os-linux.yml | 8 |
7 files changed, 19 insertions, 0 deletions
diff --git a/.gitlab/artifacts.yml b/.gitlab/artifacts.yml index 2eadcb1..f1c0c7e 100644 --- a/.gitlab/artifacts.yml +++ b/.gitlab/artifacts.yml @@ -60,6 +60,7 @@ - build/Tests/RunCMake/ - build/Tests/CMakeOnly/ - build/Tests/CMakeTests/ + - build/Tests/CMakeGUI/ # CTest/CDash information. - build/Testing/ diff --git a/.gitlab/ci/configure_fedora31_ninja.cmake b/.gitlab/ci/configure_fedora31_ninja.cmake index dad6d45..2743412 100644 --- a/.gitlab/ci/configure_fedora31_ninja.cmake +++ b/.gitlab/ci/configure_fedora31_ninja.cmake @@ -1,2 +1,3 @@ set(CMake_TEST_ISPC "ON" CACHE STRING "") +set(CMake_TEST_GUI "ON" CACHE BOOL "") include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora31_common.cmake") diff --git a/.gitlab/ci/configure_macos_common.cmake b/.gitlab/ci/configure_macos_common.cmake index bd5902b..3d09779 100644 --- a/.gitlab/ci/configure_macos_common.cmake +++ b/.gitlab/ci/configure_macos_common.cmake @@ -6,4 +6,10 @@ set(Java_JAVA_EXECUTABLE "" CACHE FILEPATH "") set(Java_JAVAC_EXECUTABLE "" CACHE FILEPATH "") set(Java_JAR_EXECUTABLE "" CACHE FILEPATH "") +# Qt binaries get placed inside the source directory, which causes them to not +# be included in the install-time rpath, but we still want them in the +# build-time rpath. CMake sets CMAKE_BUILD_WITH_INSTALL_RPATH to ON by default, +# so set it to OFF. +set(CMAKE_BUILD_WITH_INSTALL_RPATH OFF CACHE BOOL "") + set(BUILD_QtDialog ON CACHE BOOL "") diff --git a/.gitlab/ci/configure_macos_makefiles.cmake b/.gitlab/ci/configure_macos_makefiles.cmake index 85f67b5..f657d98 100644 --- a/.gitlab/ci/configure_macos_makefiles.cmake +++ b/.gitlab/ci/configure_macos_makefiles.cmake @@ -1,2 +1,3 @@ +set(CMake_TEST_GUI "ON" CACHE BOOL "") include("${CMAKE_CURRENT_LIST_DIR}/configure_macos_common.cmake") include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake") diff --git a/.gitlab/ci/configure_macos_ninja.cmake b/.gitlab/ci/configure_macos_ninja.cmake index 85f67b5..f657d98 100644 --- a/.gitlab/ci/configure_macos_ninja.cmake +++ b/.gitlab/ci/configure_macos_ninja.cmake @@ -1,2 +1,3 @@ +set(CMake_TEST_GUI "ON" CACHE BOOL "") include("${CMAKE_CURRENT_LIST_DIR}/configure_macos_common.cmake") 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 719c93c..9c30a4b 100644 --- a/.gitlab/ci/configure_windows_vs2019_x64_ninja.cmake +++ b/.gitlab/ci/configure_windows_vs2019_x64_ninja.cmake @@ -1,3 +1,4 @@ set(CMake_TEST_WIX_NO_VERIFY "ON" CACHE BOOL "") +set(CMake_TEST_GUI "ON" CACHE BOOL "") include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_common.cmake") diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index 1ec5413..75f8156 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -119,6 +119,14 @@ - linux - linux-3.17 # Needed to be able to load Fedora's Qt libraries. +.linux_builder_tags_x11: + tags: + - cmake + - docker + - linux + - linux-3.17 # Needed to be able to load Fedora's Qt libraries. + - x11 + .linux_builder_tags_cuda: tags: - cmake |