From 609644c645eff8ab2021ab66bce7f5a36bd6caf1 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Thu, 4 Mar 2021 16:20:16 +0800 Subject: [PATCH] cmake: do not specify CMAKE_GENERATOR for external projects as per CMake document, > Without this option, the same generator as the main build will be > used. Signed-off-by: Kefu Chai --- cmake/modules/BuildRocksDB.cmake | 1 - src/compressor/zstd/CMakeLists.txt | 1 - 2 files changed, 2 deletions(-) diff --git a/cmake/modules/BuildRocksDB.cmake b/cmake/modules/BuildRocksDB.cmake index 5ae16442479..f71f2bb6cc4 100644 --- a/cmake/modules/BuildRocksDB.cmake +++ b/cmake/modules/BuildRocksDB.cmake @@ -46,7 +46,6 @@ function(build_rocksdb) list(APPEND rocksdb_CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}) list(APPEND rocksdb_CMAKE_ARGS -DFAIL_ON_WARNINGS=OFF) list(APPEND rocksdb_CMAKE_ARGS -DUSE_RTTI=1) - list(APPEND rocksdb_CMAKE_ARGS -G${CMAKE_GENERATOR}) CHECK_C_COMPILER_FLAG("-Wno-stringop-truncation" HAS_WARNING_STRINGOP_TRUNCATION) if(HAS_WARNING_STRINGOP_TRUNCATION) list(APPEND rocksdb_CMAKE_ARGS -DCMAKE_C_FLAGS=-Wno-stringop-truncation) diff --git a/src/compressor/zstd/CMakeLists.txt b/src/compressor/zstd/CMakeLists.txt index 1138f6207dd..5427a3317ef 100644 --- a/src/compressor/zstd/CMakeLists.txt +++ b/src/compressor/zstd/CMakeLists.txt @@ -11,7 +11,6 @@ ExternalProject_Add(zstd_ext -DCMAKE_C_FLAGS=${ZSTD_C_FLAGS} -DCMAKE_AR=${CMAKE_AR} -DCMAKE_POSITION_INDEPENDENT_CODE=${ENABLE_SHARED} - -G${CMAKE_GENERATOR} BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/libzstd BUILD_COMMAND ${CMAKE_COMMAND} --build --target libzstd_static BUILD_BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/libzstd/lib/libzstd.a" -- 2.39.5