allow one to use system ZSTD #131
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rtissera
approved these changes
Oct 23, 2024
|
Looks good thanks a lot |
|
The proposed change doesn't work on FreeBSD 14.1: I need to add Instead of appending diff --git a/CMakeLists.txt b/CMakeLists.txt
index a9625d4..b92fba5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,6 +7,7 @@ if(CMAKE_PROJECT_NAME STREQUAL "chdr")
endif()
option(INSTALL_STATIC_LIBS "Install static libraries" OFF)
option(WITH_SYSTEM_ZLIB "Use system provided zlib library" OFF)
+option(WITH_SYSTEM_ZSTD "Use system provided zstd library" OFF)
option(BUILD_LTO "Compile libchdr with link-time optimization if supported" OFF)
if(BUILD_LTO)
@@ -41,11 +42,18 @@ else()
endif()
# zstd
-option(ZSTD_BUILD_SHARED "BUILD SHARED LIBRARIES" OFF)
-option(ZSTD_BUILD_PROGRAMS "BUILD PROGRAMS" OFF)
-option(ZSTD_LEGACY_SUPPORT "LEGACY SUPPORT" OFF)
-add_subdirectory(deps/zstd-1.5.6/build/cmake EXCLUDE_FROM_ALL)
-list(APPEND CHDR_LIBS libzstd_static)
+if (WITH_SYSTEM_ZSTD)
+ find_path(ZSTD_INCLUDE_DIR NAMES zstd.h)
+ find_library(ZSTD_LIBRARIES NAMES zstd HINTS ${ZSTD_ROOT_DIR}/lib)
+ list(APPEND CHDR_INCLUDES ${ZSTD_INCLUDE_DIR})
+ list(APPEND PLATFORM_LIBS ${ZSTD_LIBRARIES})
+else()
+ option(ZSTD_BUILD_SHARED "BUILD SHARED LIBRARIES" OFF)
+ option(ZSTD_BUILD_PROGRAMS "BUILD PROGRAMS" OFF)
+ option(ZSTD_LEGACY_SUPPORT "LEGACY SUPPORT" OFF)
+ add_subdirectory(deps/zstd-1.5.6/build/cmake EXCLUDE_FROM_ALL)
+ list(APPEND CHDR_LIBS libzstd_static)
+endif()
#--------------------------------------------------
# chdr
#--------------------------------------------------Now, CMake should also install diff --git a/CMakeLists.txt b/CMakeLists.txt
index a9625d4..65dcaf6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,6 +7,7 @@ if(CMAKE_PROJECT_NAME STREQUAL "chdr")
endif()
option(INSTALL_STATIC_LIBS "Install static libraries" OFF)
option(WITH_SYSTEM_ZLIB "Use system provided zlib library" OFF)
+option(WITH_SYSTEM_ZSTD "Use system provided zstd library" OFF)
option(BUILD_LTO "Compile libchdr with link-time optimization if supported" OFF)
if(BUILD_LTO)
@@ -41,11 +42,16 @@ else()
endif()
# zstd
-option(ZSTD_BUILD_SHARED "BUILD SHARED LIBRARIES" OFF)
-option(ZSTD_BUILD_PROGRAMS "BUILD PROGRAMS" OFF)
-option(ZSTD_LEGACY_SUPPORT "LEGACY SUPPORT" OFF)
-add_subdirectory(deps/zstd-1.5.6/build/cmake EXCLUDE_FROM_ALL)
-list(APPEND CHDR_LIBS libzstd_static)
+if (WITH_SYSTEM_ZSTD)
+ find_package(zstd REQUIRED)
+ list(APPEND PLATFORM_LIBS zstd::libzstd)
+else()
+ option(ZSTD_BUILD_SHARED "BUILD SHARED LIBRARIES" OFF)
+ option(ZSTD_BUILD_PROGRAMS "BUILD PROGRAMS" OFF)
+ option(ZSTD_LEGACY_SUPPORT "LEGACY SUPPORT" OFF)
+ add_subdirectory(deps/zstd-1.5.6/build/cmake EXCLUDE_FROM_ALL)
+ list(APPEND CHDR_LIBS libzstd_static)
+endif()
#--------------------------------------------------
# chdr
#--------------------------------------------------@a-detiste: can you test if this also works for you? I think this would be a more proper way to handle this, but I'm no CMake expert. |
|
Actually it should be |
|
Hi, my CMake patch was the result of long & hesitant fumbling. Version 2 of yours is much better. |
|
Thanks! I see you used diff --git a/CMakeLists.txt b/CMakeLists.txt
index a9625d4..65dcaf6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,6 +7,7 @@ if(CMAKE_PROJECT_NAME STREQUAL "chdr")
endif()
option(INSTALL_STATIC_LIBS "Install static libraries" OFF)
option(WITH_SYSTEM_ZLIB "Use system provided zlib library" OFF)
+option(WITH_SYSTEM_ZSTD "Use system provided zstd library" OFF)
option(BUILD_LTO "Compile libchdr with link-time optimization if supported" OFF)
if(BUILD_LTO)
@@ -41,11 +42,16 @@ else()
endif()
# zstd
-option(ZSTD_BUILD_SHARED "BUILD SHARED LIBRARIES" OFF)
-option(ZSTD_BUILD_PROGRAMS "BUILD PROGRAMS" OFF)
-option(ZSTD_LEGACY_SUPPORT "LEGACY SUPPORT" OFF)
-add_subdirectory(deps/zstd-1.5.6/build/cmake EXCLUDE_FROM_ALL)
-list(APPEND CHDR_LIBS libzstd_static)
+if (WITH_SYSTEM_ZSTD)
+ find_package(zstd REQUIRED)
+ list(APPEND PLATFORM_LIBS zstd::libzstd_shared)
+else()
+ option(ZSTD_BUILD_SHARED "BUILD SHARED LIBRARIES" OFF)
+ option(ZSTD_BUILD_PROGRAMS "BUILD PROGRAMS" OFF)
+ option(ZSTD_LEGACY_SUPPORT "LEGACY SUPPORT" OFF)
+ add_subdirectory(deps/zstd-1.5.6/build/cmake EXCLUDE_FROM_ALL)
+ list(APPEND CHDR_LIBS libzstd_static)
+endif()
#--------------------------------------------------
# chdr
#--------------------------------------------------I think this is also what this PR should use after you have confirmed that this works for you. |
|
Let’s run CI and merge if okay |
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hi, I used this to de-vendor ZSTD