commit f4c99fb5854d957edee9135615fe95be318d9660
author Wan-Teh Chang <wtc@google.com> Thu Jul 25 16:35:45 2024 -0700
committer Wan-Teh Chang <wtc@google.com> Fri Jul 26 06:06:40 2024 -0700
tree ca074c9f2d8c7b62c1ba7826dda7710a43996fd0
parent 65a37e61dbad8326ad624541142e12ee11492421

Provide both avifincrtest_helpers{_internal}

Provide both the avifincrtest_helpers and avifincrtest_helpers_internal
OBJECT libraries. This allows us to link avifincrtest with only the avif
library but not with the avif_internal static library. avifincrtest uses
only public API functions of the libavif library, so it does not need to
depend on the avif_internal static library.

Fix https://github.com/AOMediaCodec/libavif/issues/2325.

tests/CMakeLists.txt

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index f25f11e..5739276 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -91,7 +91,9 @@
 if(AVIF_ENABLE_GTEST)
     check_avif_option(AVIF_GTEST TARGET GTest::GTest PKG_NAME GTest)
     add_library(avifincrtest_helpers OBJECT gtest/avifincrtest_helpers.cc)
-    target_link_libraries(avifincrtest_helpers avif_internal GTest::GTest)
+    target_link_libraries(avifincrtest_helpers avif GTest::GTest)
+    add_library(avifincrtest_helpers_internal OBJECT gtest/avifincrtest_helpers.cc)
+    target_link_libraries(avifincrtest_helpers_internal avif_internal GTest::GTest)
 endif()
 
 if(AVIF_ENABLE_GTEST)
@@ -115,7 +117,7 @@
     add_avif_gtest_with_data(avifencodetest)
 
     if(AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP)
-        add_avif_internal_gtest_with_data(avifgainmaptest avifincrtest_helpers)
+        add_avif_internal_gtest_with_data(avifgainmaptest avifincrtest_helpers_internal)
 
         if(AVIF_ENABLE_EXPERIMENTAL_JPEG_GAIN_MAP_CONVERSION)
             add_avif_gtest_with_data(avifjpeggainmaptest)