diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2020-10-20 14:51:42 -0400 |
|---|---|---|
| committer | Kyle Edwards <kyle.edwards@kitware.com> | 2020-10-20 14:51:42 -0400 |
| commit | cf6ac2d365dcfb00b32a0a10ac0c48a401d42ef5 (patch) | |
| tree | a25f17669a4dfa68880e0bf56f9d70fe46870c40 /.gitlab | |
| parent | 21bc2fd945aa06c640bd609bf1e57cc208d6d6bd (diff) | |
| parent | 8bb8c9fb138c0eb94f05f069577b16afc37faa46 (diff) | |
| download | cmake-cf6ac2d365dcfb00b32a0a10ac0c48a401d42ef5.tar.gz | |
Merge branch 'master' into cmakepresets-schema
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/configure_debian10_ninja.cmake | 1 | ||||
| -rw-r--r-- | .gitlab/ci/configure_fedora31_makefiles.cmake | 1 | ||||
| -rw-r--r-- | .gitlab/os-linux.yml | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/.gitlab/ci/configure_debian10_ninja.cmake b/.gitlab/ci/configure_debian10_ninja.cmake index 2340543180..90556bfd21 100644 --- a/.gitlab/ci/configure_debian10_ninja.cmake +++ b/.gitlab/ci/configure_debian10_ninja.cmake @@ -19,6 +19,7 @@ set(CMake_TEST_FindGSL "ON" CACHE BOOL "") set(CMake_TEST_FindGTest "ON" CACHE BOOL "") set(CMake_TEST_FindGTK2 "ON" CACHE BOOL "") set(CMake_TEST_FindIconv "ON" CACHE BOOL "") +set(CMake_TEST_FindIntl "ON" CACHE BOOL "") set(CMake_TEST_FindJPEG "ON" CACHE BOOL "") set(CMake_TEST_FindJsonCpp "ON" CACHE BOOL "") set(CMake_TEST_FindLAPACK "ON" CACHE BOOL "") diff --git a/.gitlab/ci/configure_fedora31_makefiles.cmake b/.gitlab/ci/configure_fedora31_makefiles.cmake index 8d2454fef0..db2d0059be 100644 --- a/.gitlab/ci/configure_fedora31_makefiles.cmake +++ b/.gitlab/ci/configure_fedora31_makefiles.cmake @@ -19,6 +19,7 @@ set(CMake_TEST_FindGSL "ON" CACHE BOOL "") set(CMake_TEST_FindGTest "ON" CACHE BOOL "") set(CMake_TEST_FindGTK2 "ON" CACHE BOOL "") set(CMake_TEST_FindIconv "ON" CACHE BOOL "") +set(CMake_TEST_FindIntl "ON" CACHE BOOL "") set(CMake_TEST_FindJPEG "ON" CACHE BOOL "") set(CMake_TEST_FindJsonCpp "ON" CACHE BOOL "") set(CMake_TEST_FindLAPACK "ON" CACHE BOOL "") diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index 9438676260..315552ba0a 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -52,7 +52,7 @@ image: "kitware/cmake:ci-fedora31-x86_64-2020-10-20" variables: - GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci" + GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes" #### Lint builds |