2018-11-02 11:47:44 +08:00
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2020-10-13 08:13:33 +08:00
|
|
|
index f9c8f3346..59747a684 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()
|
