|
@@ -1,18 +1,11 @@
|
|
|
--- a/Utilities/cmlibarchive/CMakeLists.txt
|
|
|
+++ b/Utilities/cmlibarchive/CMakeLists.txt
|
|
|
-@@ -632,8 +632,13 @@ IF(ENABLE_ZSTD)
|
|
|
+@@ -636,7 +636,7 @@ IF(ENABLE_ZSTD)
|
|
|
SET(ZSTD_FIND_QUIETLY TRUE)
|
|
|
ENDIF (ZSTD_INCLUDE_DIR)
|
|
|
|
|
|
-- FIND_PATH(ZSTD_INCLUDE_DIR zstd.h)
|
|
|
-- FIND_LIBRARY(ZSTD_LIBRARY NAMES zstd libzstd)
|
|
|
-+ IF(UNIX)
|
|
|
-+ FIND_PACKAGE(PkgConfig QUIET)
|
|
|
-+ PKG_SEARCH_MODULE(PC_ZSTD libzstd)
|
|
|
-+ ENDIF()
|
|
|
-+
|
|
|
-+ FIND_PATH(ZSTD_INCLUDE_DIR zstd.h HINTS ${PC_ZSTD_INCLUDEDIR} ${PC_ZSTD_INCLUDE_DIRS})
|
|
|
-+ FIND_LIBRARY(ZSTD_LIBRARY NAMES zstd HINTS ${PC_ZSTD_LIBDIR} ${PC_ZSTD_LIBRARY_DIRS})
|
|
|
- INCLUDE(FindPackageHandleStandardArgs)
|
|
|
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZSTD DEFAULT_MSG ZSTD_LIBRARY ZSTD_INCLUDE_DIR)
|
|
|
- ELSE(ENABLE_ZSTD)
|
|
|
+- IF(0) # CMake does not let pkg-config override its search paths.
|
|
|
++ IF(1) # CMake does not let pkg-config override its search paths.
|
|
|
+ IF(UNIX)
|
|
|
+ FIND_PACKAGE(PkgConfig QUIET)
|
|
|
+ PKG_SEARCH_MODULE(PC_ZSTD libzstd)
|