Iterating

Author: rzikm

src/native/libs/System.IO.Compression.Native/CMakeLists.txt

@@ -79,7 +79,7 @@ if (CLR_CMAKE_TARGET_UNIX OR CLR_CMAKE_TARGET_BROWSER OR CLR_CMAKE_TARGET_WASI)
         target_include_directories(System.IO.Compression.Native PRIVATE ${BROTLI_INCLUDE_DIRS})
         target_link_libraries(System.IO.Compression.Native PRIVATE ${BROTLI_LIBRARIES})
 
-        target_link_libraries(System.IO.Compression.Native PUBLIC libzstd_static)
+        target_link_libraries(System.IO.Compression.Native PRIVATE libzstd_static)
 
         if (NOT CLR_CMAKE_TARGET_ARCH_WASM AND NOT CLR_CMAKE_TARGET_MACCATALYST AND NOT CLR_CMAKE_TARGET_IOS AND NOT CLR_CMAKE_TARGET_TVOS AND NOT CLR_CMAKE_TARGET_ANDROID AND NOT CLR_CMAKE_USE_SYSTEM_BROTLI)
             set(DEF_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/System.IO.Compression.Native_unixexports.src)
@@ -148,6 +148,7 @@ if (CLR_CMAKE_TARGET_UNIX OR CLR_CMAKE_TARGET_BROWSER OR CLR_CMAKE_TARGET_WASI)
     endif()
     if (CLR_CMAKE_TARGET_ARCH_WASM)
         install (TARGETS zlib DESTINATION sharedFramework COMPONENT runtime)
+        install (TARGETS libzstd_static DESTINATION sharedFramework COMPONENT runtime)
     endif()
 else ()
     set(NATIVE_LIBS_EXTRA)

src/native/libs/System.IO.Compression.Native/extra_libs.cmake

@@ -30,7 +30,5 @@ macro(append_extra_compression_libs NativeLibsExtra)
   if (CLR_CMAKE_USE_SYSTEM_ZSTD)
     find_library(ZSTD zstd REQUIRED)
     list(APPEND ${NativeLibsExtra} ${ZSTD})
-  else ()
-    list(APPEND ${NativeLibsExtra} libzstd)
   endif ()
 endmacro()