]> git.ipfire.org Git - thirdparty/zlib-ng.git/commitdiff
Simplify linking gtest_zlib with zlib target based on BUILD_SHARED_LIBS.
authorNathan Moinvaziri <nathan@nathanm.com>
Wed, 8 Feb 2023 06:08:55 +0000 (22:08 -0800)
committerHans Kristian Rosbach <hk-github@circlestorm.org>
Wed, 8 Feb 2023 19:35:58 +0000 (20:35 +0100)
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.

test/CMakeLists.txt

index 11cf73175e1e238dae16da4dcdd0823f6bb8f7c0..e8819899ed70cff18be17e440495417a36ecadc7 100644 (file)
@@ -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)