diff options
| author | Vladislav Shchapov <vladislav@shchapov.ru> | 2026-01-10 00:47:20 +0500 |
|---|---|---|
| committer | Hans Kristian Rosbach <hk-github@circlestorm.org> | 2026-01-11 10:32:39 +0100 |
| commit | 7f8c8f2553e77ec71249923ca4932814a892cf33 (patch) | |
| tree | dfdb50208ee3229fdcdab49c5461a19943cbfbaa /test | |
| parent | 811df15509ba616352ec806c8e4398d61fdf2127 (diff) | |
| download | Project-Tick-7f8c8f2553e77ec71249923ca4932814a892cf33.tar.gz Project-Tick-7f8c8f2553e77ec71249923ca4932814a892cf33.zip | |
Replace deprecated FetchContent_Populate with FetchContent_MakeAvailable
Signed-off-by: Vladislav Shchapov <vladislav@shchapov.ru>
Diffstat (limited to 'test')
| -rw-r--r-- | test/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | test/benchmarks/CMakeLists.txt | 22 | ||||
| -rw-r--r-- | test/pigz/CMakeLists.txt | 5 |
3 files changed, 12 insertions, 24 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index eacea5ead7..9a2342a379 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -134,13 +134,10 @@ if(WITH_GTEST) message(STATUS "Git checking out GoogleTest ${GTEST_TAG}") FetchContent_Declare(googletest GIT_REPOSITORY ${GTEST_REPOSITORY} - GIT_TAG ${GTEST_TAG}) + GIT_TAG ${GTEST_TAG} + ${ZNG_FetchContent_Declare_EXCLUDE_FROM_ALL}) - FetchContent_GetProperties(googletest) - if(NOT googletest_POPULATED) - FetchContent_Populate(googletest) - add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR} EXCLUDE_FROM_ALL) - endif() + ZNG_FetchContent_MakeAvailable(googletest) add_library(GTest::GTest ALIAS gtest) add_library(GTest::Main ALIAS gtest_main) endif() diff --git a/test/benchmarks/CMakeLists.txt b/test/benchmarks/CMakeLists.txt index 832b306152..62585da78d 100644 --- a/test/benchmarks/CMakeLists.txt +++ b/test/benchmarks/CMakeLists.txt @@ -28,13 +28,10 @@ if(NOT benchmark_FOUND) FetchContent_Declare(benchmark GIT_REPOSITORY ${GBENCHMARK_REPOSITORY} - GIT_TAG ${GBENCHMARK_TAG}) + GIT_TAG ${GBENCHMARK_TAG} + ${ZNG_FetchContent_Declare_EXCLUDE_FROM_ALL}) - FetchContent_GetProperties(benchmark) - if(NOT benchmark_POPULATED) - FetchContent_Populate(benchmark) - add_subdirectory(${benchmark_SOURCE_DIR} ${benchmark_BINARY_DIR} EXCLUDE_FROM_ALL) - endif() + ZNG_FetchContent_MakeAvailable(benchmark) endif() add_executable(benchmark_zlib @@ -74,14 +71,11 @@ if(WITH_BENCHMARK_APPS) if(NOT PNG_FOUND) FetchContent_Declare(PNG - GIT_REPOSITORY https://github.com/glennrp/libpng.git) - - FetchContent_GetProperties(PNG) - if(NOT PNG_POPULATED) - FetchContent_Populate(PNG) - set(PNG_INCLUDE_DIR ${png_SOURCE_DIR}) - add_subdirectory(${png_SOURCE_DIR} ${png_BINARY_DIR}) - endif() + GIT_REPOSITORY https://github.com/glennrp/libpng.git + ${ZNG_FetchContent_Declare_EXCLUDE_FROM_ALL}) + + ZNG_FetchContent_MakeAvailable(PNG) + set(PNG_INCLUDE_DIR ${png_SOURCE_DIR}) endif() set(BENCH_APP_SRCS diff --git a/test/pigz/CMakeLists.txt b/test/pigz/CMakeLists.txt index bd4395acd4..42f1f43d47 100644 --- a/test/pigz/CMakeLists.txt +++ b/test/pigz/CMakeLists.txt @@ -65,10 +65,7 @@ FetchContent_Declare(pigz GIT_REPOSITORY https://github.com/madler/pigz.git GIT_TAG ${PIGZ_TAG}) -FetchContent_GetProperties(pigz) -if(NOT pigz_POPULATED) - FetchContent_Populate(pigz) -endif() +FetchContent_MakeAvailable(pigz) set(PIGZ_SRCS ${pigz_SOURCE_DIR}/pigz.c |