diff options
| author | Brad King <brad.king@kitware.com> | 2020-11-20 15:15:53 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-11-20 15:15:53 (GMT) |
| commit | 3bc549540e117a949707c51fcdf110fdc51e3d93 (patch) | |
| tree | e736abff616bf3c411881074a156fdae490f6f71 /.gitlab/ci | |
| parent | 64dc4efc511f766d0a099df717e2f35f9eccabce (diff) | |
| parent | bf241bcc1e5cda69775c05022e146a7f4f76b41b (diff) | |
| download | CMake-3bc549540e117a949707c51fcdf110fdc51e3d93.zip CMake-3bc549540e117a949707c51fcdf110fdc51e3d93.tar.gz CMake-3bc549540e117a949707c51fcdf110fdc51e3d93.tar.bz2 | |
Merge branch 'master' into FindGTest-revert-no-release
Diffstat (limited to '.gitlab/ci')
| -rw-r--r-- | .gitlab/ci/configure_debian10_ninja.cmake | 1 | ||||
| -rw-r--r-- | .gitlab/ci/configure_fedora33_makefiles.cmake | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/.gitlab/ci/configure_debian10_ninja.cmake b/.gitlab/ci/configure_debian10_ninja.cmake index 2340543..90556bf 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_fedora33_makefiles.cmake b/.gitlab/ci/configure_fedora33_makefiles.cmake index 8d2454f..db2d005 100644 --- a/.gitlab/ci/configure_fedora33_makefiles.cmake +++ b/.gitlab/ci/configure_fedora33_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 "") |