2018-11-02 11:47:44 +08:00
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2020-03-11 08:21:14 +08:00
|
|
|
index eebda35e9..cf48c7ad5 100644
|
2018-11-02 11:47:44 +08:00
|
|
|
--- a/CMakeLists.txt
|
|
|
|
|
+++ b/CMakeLists.txt
|
2020-03-11 08:21:14 +08:00
|
|
|
@@ -67,7 +67,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "Windows")
|
|
|
|
|
else()
|
|
|
|
|
option(WITH_FOLLY_DISTRIBUTED_MUTEX "build with folly::DistributedMutex" OFF)
|
2019-04-04 13:15:26 +08:00
|
|
|
endif()
|
2018-11-02 11:47:44 +08:00
|
|
|
-if(MSVC)
|
|
|
|
|
+if(MSVC AND NOT VCPKG_TOOLCHAIN)
|
|
|
|
|
# Defaults currently different for GFLAGS.
|
|
|
|
|
# We will address find_package work a little later
|
|
|
|
|
option(WITH_GFLAGS "build with GFlags" OFF)
|
