[PATCH] D133222: use LLVM_USE_STATIC_ZSTD

[Cole Kissane via Phabricator via llvm-commits]

This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rGfc1da043f4f9: use LLVM_USE_STATIC_ZSTD (authored by ckissane).

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D133222/new/

https://reviews.llvm.org/D133222

Files:
  llvm/CMakeLists.txt
  llvm/lib/Support/CMakeLists.txt


Index: llvm/lib/Support/CMakeLists.txt
===================================================================
--- llvm/lib/Support/CMakeLists.txt
+++ llvm/lib/Support/CMakeLists.txt
@@ -25,21 +25,11 @@
   list(APPEND imported_libs ZLIB::ZLIB)
 endif()
 
-set(zstd_target none)
-
 if(LLVM_ENABLE_ZSTD)
-  if(LLVM_PREFER_STATIC_ZSTD)
-    if(TARGET zstd::libzstd_static)
-      set(zstd_target zstd::libzstd_static)
-    else()
-      set(zstd_target zstd::libzstd_shared)
-    endif()
+  if(TARGET zstd::libzstd_shared AND NOT LLVM_USE_STATIC_ZSTD)
+    set(zstd_target zstd::libzstd_shared)
   else()
-    if(TARGET zstd::libzstd_shared)
-      set(zstd_target zstd::libzstd_shared)
-    else()
-      set(zstd_target zstd::libzstd_static)
-    endif()
+    set(zstd_target zstd::libzstd_static)
   endif()
 endif()
 
Index: llvm/CMakeLists.txt
===================================================================
--- llvm/CMakeLists.txt
+++ llvm/CMakeLists.txt
@@ -486,7 +486,7 @@
 
 set(LLVM_ENABLE_ZSTD "ON" CACHE STRING "Use zstd for compression/decompression if available. Can be ON, OFF, or FORCE_ON")
 
-set(LLVM_PREFER_STATIC_ZSTD TRUE CACHE BOOL "Use static version of zstd if available. Can be TRUE, FALSE")
+set(LLVM_USE_STATIC_ZSTD FALSE CACHE BOOL "Use static version of zstd. Can be TRUE, FALSE")
 
 set(LLVM_ENABLE_CURL "OFF" CACHE STRING "Use libcurl for the HTTP client if available. Can be ON, OFF, or FORCE_ON")
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D133222.457697.patch
Type: text/x-patch
Size: 1429 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20220902/0e2360c8/attachment.bin>