From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Sun, 21 Aug 2022 17:03:32 +0000 (-0700)
Subject: Fixed content already populated error in CMake scripts. #1327
X-Git-Tag: 2.1.0-beta1~182
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab47c738037dc51d0d44de7e64661648c24c9fb4;p=thirdparty%2Fzlib-ng.git

Fixed content already populated error in CMake scripts. #1327

Should only need to use either FetchContent_MakeAvailable or
FetchContent_GetProperties and FetchContent_Populate but not both methods. We
use the later for CMake compatibility with lower versions.
---

diff --git a/test/benchmarks/CMakeLists.txt b/test/benchmarks/CMakeLists.txt
index 19762fc73..e6eaa352b 100644
--- a/test/benchmarks/CMakeLists.txt
+++ b/test/benchmarks/CMakeLists.txt
@@ -14,11 +14,11 @@ if(NOT benchmark_FOUND)
     set(BENCHMARK_ENABLE_TESTING OFF)
     FetchContent_Declare(benchmark
         GIT_REPOSITORY https://github.com/google/benchmark.git)
-    FetchContent_MakeAvailable(benchmark)
-    FetchContent_GetProperties(benchmark)
 
+    FetchContent_GetProperties(benchmark)
     if(NOT benchmark_POPULATED)
         FetchContent_Populate(benchmark)
+        add_subdirectory(${benchmark_SOURCE_DIR} ${benchmark_BINARY_DIR})
     endif()
 endif()
 
@@ -55,15 +55,15 @@ if(WITH_BENCHMARK_APPS)
     if(NOT PNG_FOUND)
         FetchContent_Declare(PNG
             GIT_REPOSITORY https://github.com/glennrp/libpng.git)
-        FetchContent_MakeAvailable(PNG)
-        FetchContent_GetProperties(PNG)
 
+        FetchContent_GetProperties(PNG)
         if(NOT PNG_POPULATED)
             FetchContent_Populate(PNG)
+            add_subdirectory(${PNG_SOURCE_DIR} ${PNG_BINARY_DIR})
         endif()
     endif()
 
-    set(BENCH_APP_SRCS 
+    set(BENCH_APP_SRCS
         benchmark_png_encode.cc
         benchmark_png_decode.cc
         benchmark_main.cc
diff --git a/test/pigz/CMakeLists.txt b/test/pigz/CMakeLists.txt
index d1f5b22d2..bc6830ae2 100644
--- a/test/pigz/CMakeLists.txt
+++ b/test/pigz/CMakeLists.txt
@@ -64,9 +64,8 @@ endif()
 FetchContent_Declare(pigz
     GIT_REPOSITORY https://github.com/madler/pigz.git
     GIT_TAG ${PIGZ_TAG})
-FetchContent_MakeAvailable(pigz)
-FetchContent_GetProperties(pigz)
 
+FetchContent_GetProperties(pigz)
 if(NOT pigz_POPULATED)
     FetchContent_Populate(pigz)
 endif()