mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-24 05:57:49 +08:00
91ba6e4631
* [rocksdb] Update to v5.15.10 * [rocksdb] Cleanup * [rocksdb] Fix cmake targets name. * [toolchains] Set NDEBUG in release * [rocksdb] Disable vcpkg_test_cmake due to misbehavior in x64 * [tiff] Use lzma on linux
14 lines
496 B
Diff
14 lines
496 B
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 43256fc04..204761256 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -49,7 +49,7 @@ option(WITH_SNAPPY "build with SNAPPY" OFF)
|
|
option(WITH_LZ4 "build with lz4" OFF)
|
|
option(WITH_ZLIB "build with zlib" OFF)
|
|
option(WITH_ZSTD "build with zstd" OFF)
|
|
-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)
|