authorgravatar for kcbanner@gmail.comCasey Banner <kcbanner@gmail.com> 2023-01-03 02:51:22-05:00
committergravatar for kcbanner@gmail.comCasey Banner <kcbanner@gmail.com> 2023-01-04 21:45:06-05:00
logf5135f8e3b0d7a23d44944c720b6a6f3410a2b3a
tree3b995a457e114d0153df5775c904de16f37d62ce
parent88e442253b5cd0087b3f8da63e1653b9356dc6ab

cmake: fix handling of transitive zstd dependency

- Remove ZIG_ENABLE_ZSTD in favour of allowing ZIG_STATIC_ZSTD to be toggled off explicitly when ZIG_STATIC is on - Remove ZIG_ENABLE_LIBCPP (now unused)

1 files changed, 10 insertions(+), 13 deletions(-)

CMakeLists.txt+10-13
...@@ -89,11 +89,9 @@ endif()...@@ -89,11 +89,9 @@ endif()
8989
90set(ZIG_STATIC off CACHE BOOL "Attempt to build a static zig executable (not compatible with glibc)")90set(ZIG_STATIC off CACHE BOOL "Attempt to build a static zig executable (not compatible with glibc)")
91set(ZIG_SHARED_LLVM off CACHE BOOL "Prefer linking against shared LLVM libraries")91set(ZIG_SHARED_LLVM off CACHE BOOL "Prefer linking against shared LLVM libraries")
92set(ZIG_STATIC_LLVM off CACHE BOOL "Prefer linking against static LLVM libraries")92set(ZIG_STATIC_LLVM ${ZIG_STATIC} CACHE BOOL "Prefer linking against static LLVM libraries")
93set(ZIG_STATIC_ZLIB off CACHE BOOL "Prefer linking against static zlib")93set(ZIG_STATIC_ZLIB ${ZIG_STATIC} CACHE BOOL "Prefer linking against static zlib")
94set(ZIG_ENABLE_ZSTD on CACHE BOOL "Enable linking zstd")94set(ZIG_STATIC_ZSTD ${ZIG_STATIC} CACHE BOOL "Prefer linking against static zstd")
95set(ZIG_ENABLE_LIBCPP on CACHE BOOL "Enable linking libcpp")
96set(ZIG_STATIC_ZSTD off CACHE BOOL "Prefer linking against static zstd")
97set(ZIG_USE_CCACHE off CACHE BOOL "Use ccache")95set(ZIG_USE_CCACHE off CACHE BOOL "Use ccache")
9896
99if(ZIG_USE_CCACHE)97if(ZIG_USE_CCACHE)
...@@ -105,12 +103,6 @@ if(ZIG_USE_CCACHE)...@@ -105,12 +103,6 @@ if(ZIG_USE_CCACHE)
105 endif()103 endif()
106endif()104endif()
107105
108if(ZIG_STATIC)
109 set(ZIG_STATIC_LLVM ON)
110 set(ZIG_STATIC_ZLIB ON)
111 set(ZIG_STATIC_ZSTD ON)
112endif()
113
114if (ZIG_SHARED_LLVM AND ZIG_STATIC_LLVM)106if (ZIG_SHARED_LLVM AND ZIG_STATIC_LLVM)
115 message(SEND_ERROR "-DZIG_SHARED_LLVM and -DZIG_STATIC_LLVM cannot both be enabled simultaneously")107 message(SEND_ERROR "-DZIG_SHARED_LLVM and -DZIG_STATIC_LLVM cannot both be enabled simultaneously")
116endif()108endif()
...@@ -150,8 +142,13 @@ if(ZIG_STATIC_ZLIB)...@@ -150,8 +142,13 @@ if(ZIG_STATIC_ZLIB)
150 list(APPEND LLVM_LIBRARIES "${ZLIB}")142 list(APPEND LLVM_LIBRARIES "${ZLIB}")
151endif()143endif()
152144
153if(ZIG_STATIC_ZSTD AND ZIG_ENABLE_ZSTD)145if(ZIG_STATIC_ZSTD)
154 list(REMOVE_ITEM LLVM_SYSTEM_LIBRARIES "-lzstd")146 if (MSVC)
147 list(REMOVE_ITEM LLVM_SYSTEM_LIBRARIES "zstd.lib")
148 else()
149 list(REMOVE_ITEM LLVM_SYSTEM_LIBRARIES "-lzstd")
150 endif()
151
155 find_library(ZSTD NAMES libzstd.a libzstdstatic.a zstd NAMES_PER_DIR)152 find_library(ZSTD NAMES libzstd.a libzstdstatic.a zstd NAMES_PER_DIR)
156 list(APPEND LLVM_LIBRARIES "${ZSTD}")153 list(APPEND LLVM_LIBRARIES "${ZSTD}")
157endif()154endif()