diff options
Diffstat (limited to '.gitlab/ci')
-rw-r--r-- | .gitlab/ci/configure_macos_x86_64_ninja_ub.cmake | 2 | ||||
-rw-r--r-- | .gitlab/ci/configure_macos_x86_64_xcode_ub.cmake | 2 | ||||
-rw-r--r-- | .gitlab/ci/configure_sphinx.cmake | 3 | ||||
-rw-r--r-- | .gitlab/ci/configure_windows_vs_common.cmake | 1 | ||||
-rw-r--r-- | .gitlab/ci/configure_windows_vs_common_ninja.cmake | 1 | ||||
-rw-r--r-- | .gitlab/ci/env_macos_x86_64_ninja_ub.cmake | 1 | ||||
-rw-r--r-- | .gitlab/ci/env_macos_x86_64_xcode_ub.cmake | 1 |
7 files changed, 11 insertions, 0 deletions
diff --git a/.gitlab/ci/configure_macos_x86_64_ninja_ub.cmake b/.gitlab/ci/configure_macos_x86_64_ninja_ub.cmake new file mode 100644 index 0000000000..1b976d261a --- /dev/null +++ b/.gitlab/ci/configure_macos_x86_64_ninja_ub.cmake @@ -0,0 +1,2 @@ +include("${CMAKE_CURRENT_LIST_DIR}/configure_macos_common.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/configure_macos_x86_64_xcode_ub.cmake b/.gitlab/ci/configure_macos_x86_64_xcode_ub.cmake new file mode 100644 index 0000000000..1b976d261a --- /dev/null +++ b/.gitlab/ci/configure_macos_x86_64_xcode_ub.cmake @@ -0,0 +1,2 @@ +include("${CMAKE_CURRENT_LIST_DIR}/configure_macos_common.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/configure_sphinx.cmake b/.gitlab/ci/configure_sphinx.cmake index 3750309ae2..9f3f0bea7c 100644 --- a/.gitlab/ci/configure_sphinx.cmake +++ b/.gitlab/ci/configure_sphinx.cmake @@ -4,3 +4,6 @@ set(SPHINX_HTML ON CACHE BOOL "") set(SPHINX_SINGLEHTML ON CACHE BOOL "") set(SPHINX_QTHELP ON CACHE BOOL "") set(SPHINX_TEXT ON CACHE BOOL "") +if(NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "") + set(SPHINX_LINKCHECK ON CACHE BOOL "") +endif() diff --git a/.gitlab/ci/configure_windows_vs_common.cmake b/.gitlab/ci/configure_windows_vs_common.cmake index 962f03db9f..daf9aaad3e 100644 --- a/.gitlab/ci/configure_windows_vs_common.cmake +++ b/.gitlab/ci/configure_windows_vs_common.cmake @@ -4,6 +4,7 @@ set(CMake_TEST_FindOpenMP "ON" CACHE BOOL "") set(CMake_TEST_FindOpenMP_C "ON" CACHE BOOL "") set(CMake_TEST_FindOpenMP_CXX "ON" CACHE BOOL "") set(CMake_TEST_FindOpenMP_Fortran "OFF" CACHE BOOL "") +set(CMake_TEST_FindPatch "ON" CACHE BOOL "") set(CMake_TEST_Java OFF CACHE BOOL "") set(CMake_TEST_MFC "ON" CACHE BOOL "") diff --git a/.gitlab/ci/configure_windows_vs_common_ninja.cmake b/.gitlab/ci/configure_windows_vs_common_ninja.cmake index 1ae1a66bd4..9f7acc3246 100644 --- a/.gitlab/ci/configure_windows_vs_common_ninja.cmake +++ b/.gitlab/ci/configure_windows_vs_common_ninja.cmake @@ -6,6 +6,7 @@ set(CMake_TEST_FindOpenMP "ON" CACHE BOOL "") set(CMake_TEST_FindOpenMP_C "ON" CACHE BOOL "") set(CMake_TEST_FindOpenMP_CXX "ON" CACHE BOOL "") set(CMake_TEST_FindOpenMP_Fortran "OFF" CACHE BOOL "") +set(CMake_TEST_FindPatch "ON" CACHE BOOL "") set(CMake_TEST_IPO_WORKS_C "ON" CACHE BOOL "") set(CMake_TEST_IPO_WORKS_CXX "ON" CACHE BOOL "") set(CMake_TEST_MFC "ON" CACHE BOOL "") diff --git a/.gitlab/ci/env_macos_x86_64_ninja_ub.cmake b/.gitlab/ci/env_macos_x86_64_ninja_ub.cmake new file mode 100644 index 0000000000..4b5c401ef9 --- /dev/null +++ b/.gitlab/ci/env_macos_x86_64_ninja_ub.cmake @@ -0,0 +1 @@ +set(ENV{CMAKE_OSX_ARCHITECTURES} "x86_64;arm64") diff --git a/.gitlab/ci/env_macos_x86_64_xcode_ub.cmake b/.gitlab/ci/env_macos_x86_64_xcode_ub.cmake new file mode 100644 index 0000000000..4b5c401ef9 --- /dev/null +++ b/.gitlab/ci/env_macos_x86_64_xcode_ub.cmake @@ -0,0 +1 @@ +set(ENV{CMAKE_OSX_ARCHITECTURES} "x86_64;arm64") |