From 3db3ab46e91c5be2d4b6e44d73df46a47ca77086 Mon Sep 17 00:00:00 2001 From: Sergey Kosukhin <sergey.kosukhin@mpimet.mpg.de> Date: Mon, 10 Jul 2023 05:43:39 +0000 Subject: [PATCH] Apply 5 suggestion(s) to 2 file(s) --- .gitlab-ci.yml | 1 + test/CMakeLists.txt | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 45cd401..17f9f7a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,6 +14,7 @@ gcc11: - make test tags: - xen, levante + intel22: stage: build_and_test before_script: diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index b6c477d..497cca3 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,11 +1,12 @@ include(FetchContent) +if ("${CMAKE_VERSION}" VERSION_GREATER_EQUAL "3.24") + cmake_policy(SET CMP0135 NEW) +endif() + enable_language(CXX) find_package(GTest 1.13) if(NOT GTest_FOUND) - if ("${CMAKE_VERSION}" VERSION_GREATER_EQUAL "3.24") - cmake_policy(SET CMP0135 NEW) - endif() message(CHECK_START "Fetching external GTest") FetchContent_Declare(googletest URL https://github.com/google/googletest/archive/refs/tags/v1.13.0.tar.gz @@ -16,9 +17,10 @@ if(NOT GTest_FOUND) message(CHECK_PASS "done") endif() -FetchContent_Declare( - fortutf - GIT_REPOSITORY https://github.com/artemis-beta/FortUTF.git - GIT_TAG main +message(CHECK_START "Fetching external FortUTF") +FetchContent_Declare(fortutf + URL https://github.com/artemis-beta/FortUTF/archive/9f70d03c5d92c4023b1eab312af18ff56790c00a.tar.gz + URL_HASH MD5=143941264dc552599ab7b32fd17c4195 ) -FetchContent_MakeAvailable(fortutf) \ No newline at end of file +FetchContent_MakeAvailable(fortutf) +message(CHECK_PASS "done") \ No newline at end of file -- GitLab