vcpkg/ports/rocksdb/0003-use-find-package.patch

62 lines
1.7 KiB
Diff
Raw Normal View History

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6761929..6f74d31 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
2020-10-13 08:13:33 +08:00
@@ -91,7 +91,7 @@ include(CMakeDependentOption)
CMAKE_DEPENDENT_OPTION(WITH_GFLAGS "build with GFlags" ON
"NOT MSVC;NOT MINGW" OFF)
-if(MSVC)
+if(MSVC AND NOT VCPKG_TOOLCHAIN)
2020-10-13 08:13:33 +08:00
option(WITH_XPRESS "build with windows built in compression" OFF)
include(${CMAKE_CURRENT_SOURCE_DIR}/thirdparty.inc)
else()
2020-10-21 07:12:34 +08:00
@@ -130,10 +130,7 @@ else()
endif()
if(WITH_SNAPPY)
- find_package(Snappy CONFIG)
- if(NOT Snappy_FOUND)
- find_package(Snappy REQUIRED)
- endif()
+ find_package(Snappy CONFIG REQUIRED)
add_definitions(-DSNAPPY)
list(APPEND THIRDPARTY_LIBS Snappy::snappy)
endif()
@@ -157,16 +154,19 @@ else()
endif()
if(WITH_LZ4)
- find_package(lz4 REQUIRED)
+ find_package(lz4 CONFIG REQUIRED)
add_definitions(-DLZ4)
list(APPEND THIRDPARTY_LIBS lz4::lz4)
2020-10-21 07:12:34 +08:00
endif()
if(WITH_ZSTD)
- find_package(zstd REQUIRED)
+ find_package(zstd CONFIG REQUIRED)
add_definitions(-DZSTD)
- include_directories(${ZSTD_INCLUDE_DIR})
- list(APPEND THIRDPARTY_LIBS zstd::zstd)
+ if(TARGET zstd::libzstd_shared)
+ list(APPEND THIRDPARTY_LIBS zstd::libzstd_shared)
+ elseif(TARGET zstd::libzstd_static)
+ list(APPEND THIRDPARTY_LIBS zstd::libzstd_static)
+ endif()
2020-10-21 07:12:34 +08:00
endif()
endif()
@@ -375,9 +375,9 @@ endif()
option(WITH_TBB "build with Threading Building Blocks (TBB)" OFF)
if(WITH_TBB)
- find_package(TBB REQUIRED)
+ find_package(TBB CONFIG REQUIRED)
add_definitions(-DTBB)
- list(APPEND THIRDPARTY_LIBS TBB::TBB)
+ list(APPEND THIRDPARTY_LIBS TBB::tbb)
endif()
# Stall notifications eat some performance from inserts