Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2025-02-08 23:09:36 +01:00
Code Releases Wiki Activity

build: Fix lzma support and simplify zstd building

Browse Source
This commit is contained in:
WerWolv 2024-07-09 07:29:06 +02:00
parent edb1a8876b
commit cb406ea357
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/modules/FindZSTD.cmake
View File

@ -39,3 +39,7 @@ if (ZSTD_FOUND)
endif() endif()
mark_as_advanced(ZSTD_INCLUDE_DIR ZSTD_LIBRARY) mark_as_advanced(ZSTD_INCLUDE_DIR ZSTD_LIBRARY)
add_library(ZSTD::zstd INTERFACE IMPORTED)
set_property(TARGET ZSTD::zstd PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${ZSTD_INCLUDE_DIR})
set_property(TARGET ZSTD::zstd PROPERTY INTERFACE_LINK_LIBRARIES ${ZSTD_LIBRARY})

10
plugins/decompress/CMakeLists.txt
View File

@ -32,14 +32,12 @@ add_imhex_plugin(
ZSTD "zstd Support" ZSTD "zstd Support"
) )
find_package(ZSTD) set(LIBLZMA_HAS_AUTO_DECODER 1)
if(ZSTD_FOUND) set(LIBLZMA_HAS_EASY_ENCODER 1)
set(LIBRARIES ${LIBRARIES} "${ZSTD_LIBRARY}") set(LIBLZMA_HAS_LZMA_PRESET 1)
message(STATUS "Enabling decompression support using ZSTD (${ZSTD_VERSION})")
enable_plugin_feature(ZSTD)
endif()
addOptionalLibrary(ZLIB ZLIB) addOptionalLibrary(ZLIB ZLIB)
addOptionalLibrary(BZip2 BZip2) addOptionalLibrary(BZip2 BZip2)
addOptionalLibrary(LibLZMA LibLZMA) addOptionalLibrary(LibLZMA LibLZMA)
addOptionalLibrary(ZSTD zstd)
target_link_libraries(decompress PRIVATE ${LIBRARIES}) target_link_libraries(decompress PRIVATE ${LIBRARIES})