build: Fix lzma support and simplify zstd building

WerWolv · Jul 9, 2024 · cb406ea · cb406ea
1 parent edb1a88
commit cb406ea
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/cmake/modules/FindZSTD.cmake b/cmake/modules/FindZSTD.cmake
@@ -38,4 +38,8 @@ if (ZSTD_FOUND)
     message(STATUS "Found Zstd: ${ZSTD_LIBRARY}")
 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})
diff --git a/plugins/decompress/CMakeLists.txt b/plugins/decompress/CMakeLists.txt
@@ -32,14 +32,12 @@ add_imhex_plugin(
         ZSTD "zstd Support"
 )
 
-find_package(ZSTD)
-if(ZSTD_FOUND)
-    set(LIBRARIES ${LIBRARIES} "${ZSTD_LIBRARY}")
-    message(STATUS "Enabling decompression support using ZSTD (${ZSTD_VERSION})")
-    enable_plugin_feature(ZSTD)
-endif()
+set(LIBLZMA_HAS_AUTO_DECODER 1)
+set(LIBLZMA_HAS_EASY_ENCODER 1)
+set(LIBLZMA_HAS_LZMA_PRESET  1)
 
 addOptionalLibrary(ZLIB ZLIB)
 addOptionalLibrary(BZip2 BZip2)
 addOptionalLibrary(LibLZMA LibLZMA)
+addOptionalLibrary(ZSTD zstd)
 target_link_libraries(decompress PRIVATE ${LIBRARIES})