2018-11-02 11:47:44 +08:00
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2020-10-21 07:12:34 +08:00
|
|
|
index 36eddb32b..97a93601b 100644
|
2018-11-02 11:47:44 +08:00
|
|
|
--- 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)
|
|
|
|
|
|
2018-11-02 11:47:44 +08:00
|
|
|
-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()
|
|
|
|
|
@@ -163,10 +160,9 @@ else()
|
|
|
|
|
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)
|
|
|
|
|
+ list(APPEND THIRDPARTY_LIBS libzstd)
|
|
|
|
|
endif()
|
|
|
|
|
endif()
|
|
|
|
|
|
