diff options
| author | Brad King <brad.king@kitware.com> | 2020-09-01 13:15:29 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-09-01 13:15:39 (GMT) |
| commit | f10682b7961c2ad56384641ab141a66f34923753 (patch) | |
| tree | 4bf3b7b721dd33b6934faf6c119770bf04209891 /.gitlab/os-linux.yml | |
| parent | cd2f894052ea8191e21ec4997b2181c75f637ae9 (diff) | |
| parent | 5ece12b7e452acb091300022a392ff71dfce9504 (diff) | |
| download | CMake-f10682b7961c2ad56384641ab141a66f34923753.zip CMake-f10682b7961c2ad56384641ab141a66f34923753.tar.gz CMake-f10682b7961c2ad56384641ab141a66f34923753.tar.bz2 | |
Merge topic 'ispc_lang_support'
5ece12b7e4 gitlab-ci: add ISPC to the Fedora CI image
8976817d6d ISPC: Update help documentation to include ISPC
2368f46ba4 ISPC: Support building with the MSVC toolchain
e783bf8aa6 ISPC: Support ISPC header generation byproducts and parallel builds
34cc6acc81 Add ISPC compiler support to CMake
419d70d490 Refactor some swift only logic to be re-used by other languages
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5065
Diffstat (limited to '.gitlab/os-linux.yml')
| -rw-r--r-- | .gitlab/os-linux.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index 9ad8fc7..dfd94f5 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -30,7 +30,7 @@ ### Fedora .fedora31: - image: "kitware/cmake:ci-fedora31-x86_64-2020-06-01" + image: "kitware/cmake:ci-fedora31-x86_64-2020-08-18" variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci" |