forked from pool/rocksdb
Andreas Stieger
a680cd5960
rocksdb 9.0.0 OBS-URL: https://build.opensuse.org/request/show/1159659 OBS-URL: https://build.opensuse.org/package/show/server:database/rocksdb?expand=0&rev=39
70 lines
2.2 KiB
Diff
70 lines
2.2 KiB
Diff
From e09b9d0cb94fec262b2a5dc30111fd767c0664e9 Mon Sep 17 00:00:00 2001
|
|
From: raffertyyu <raffertyyu@tencent.com>
|
|
Date: Thu, 22 Feb 2024 14:39:05 -0800
|
|
Subject: [PATCH] Fix zstd typo in cmake (#12309)
|
|
|
|
Summary:
|
|
https://github.com/facebook/rocksdb/issues/12247 imported another typo in cmakelists.txt and findzstd.cmake.
|
|
cmake report ZSTD_INCLUDE_DIRS not found.
|
|
Actually it should be
|
|
https://github.com/facebook/rocksdb/blob/aacf60dda2a138f9d3826c25818a3bcf250859fd/cmake/modules/Findzstd.cmake#L8
|
|
|
|
Pull Request resolved: https://github.com/facebook/rocksdb/pull/12309
|
|
|
|
Reviewed By: hx235
|
|
|
|
Differential Revision: D54070348
|
|
|
|
Pulled By: ajkr
|
|
|
|
fbshipit-source-id: eaf6e260ea3669b8ea38e4c74a375bb885761b51
|
|
---
|
|
cmake/modules/Findzstd.cmake | 22 +++++++++++-----------
|
|
1 file changed, 11 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/cmake/modules/Findzstd.cmake b/cmake/modules/Findzstd.cmake
|
|
index c1916c435e1..e82fa148c8c 100644
|
|
--- a/cmake/modules/Findzstd.cmake
|
|
+++ b/cmake/modules/Findzstd.cmake
|
|
@@ -1,29 +1,29 @@
|
|
# - Find zstd
|
|
# Find the zstd compression library and includes
|
|
#
|
|
-# zstd_INCLUDE_DIRS - where to find zstd.h, etc.
|
|
-# zstd_LIBRARIES - List of libraries when using zstd.
|
|
-# zstd_FOUND - True if zstd found.
|
|
+# ZSTD_INCLUDE_DIRS - where to find zstd.h, etc.
|
|
+# ZSTD_LIBRARIES - List of libraries when using zstd.
|
|
+# ZSTD_FOUND - True if zstd found.
|
|
|
|
-find_path(zstd_INCLUDE_DIRS
|
|
+find_path(ZSTD_INCLUDE_DIRS
|
|
NAMES zstd.h
|
|
HINTS ${zstd_ROOT_DIR}/include)
|
|
|
|
-find_library(zstd_LIBRARIES
|
|
+find_library(ZSTD_LIBRARIES
|
|
NAMES zstd
|
|
HINTS ${zstd_ROOT_DIR}/lib)
|
|
|
|
include(FindPackageHandleStandardArgs)
|
|
-find_package_handle_standard_args(zstd DEFAULT_MSG zstd_LIBRARIES ZSTD_INCLUDE_DIRS)
|
|
+find_package_handle_standard_args(zstd DEFAULT_MSG ZSTD_LIBRARIES ZSTD_INCLUDE_DIRS)
|
|
|
|
mark_as_advanced(
|
|
- zstd_LIBRARIES
|
|
- zstd_INCLUDE_DIRS)
|
|
+ ZSTD_LIBRARIES
|
|
+ ZSTD_INCLUDE_DIRS)
|
|
|
|
-if(zstd_FOUND AND NOT (TARGET zstd::zstd))
|
|
+if(ZSTD_FOUND AND NOT (TARGET zstd::zstd))
|
|
add_library (zstd::zstd UNKNOWN IMPORTED)
|
|
set_target_properties(zstd::zstd
|
|
PROPERTIES
|
|
- IMPORTED_LOCATION ${zstd_LIBRARIES}
|
|
- INTERFACE_INCLUDE_DIRECTORIES ${zstd_INCLUDE_DIRS})
|
|
+ IMPORTED_LOCATION ${ZSTD_LIBRARIES}
|
|
+ INTERFACE_INCLUDE_DIRECTORIES ${ZSTD_INCLUDE_DIRS})
|
|
endif()
|