From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Wed, 8 Feb 2023 06:08:55 +0000 (-0800)
Subject: Simplify linking gtest_zlib with zlib target based on BUILD_SHARED_LIBS.
X-Git-Tag: 2.1.0-beta1~55
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=10238c8824e7a714a2a4cf37fd8c27fc52656f64;p=thirdparty%2Fzlib-ng.git

Simplify linking gtest_zlib with zlib target based on BUILD_SHARED_LIBS.

Since we turn ZLIBNG_ENABLE_TESTS on or off based on BUILD_SHARED_LIBS, then we
don't have to worry about it when linking against zlib.
---

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 11cf7317..e8819899 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -230,12 +230,15 @@ if(WITH_GTEST)
         target_link_libraries(gtest_zlib external_zlib)
     endif()
 
-    if((NOT ZLIBNG_ENABLE_TESTS) AND ZLIB_COMPAT AND (NOT DEFINED BUILD_SHARED_LIBS OR BUILD_SHARED_LIBS))
-        # Link dynamically in order to be able to substitute zlib-ng with zlib.
-        target_link_libraries(gtest_zlib zlib GTest::Main)
-    else()
+    if(NOT DEFINED BUILD_SHARED_LIBS)
         # Link statically in order to test internal zlib-ng functions.
         target_link_libraries(gtest_zlib zlibstatic)
+    else()
+        target_link_libraries(gtest_zlib zlib)
+    endif()
+
+    if(BUILD_SHARED_LIBS)
+        target_link_libraries(gtest_zlib GTest::Main)
     endif()
     target_link_libraries(gtest_zlib GTest::GTest)