Skip to content

Commit 122c0ec

Browse files
committed
Expose CPPSTD configuration
Signed-off-by: yhmo <yihua.mo@zilliz.com>
1 parent 54a0b5e commit 122c0ec

3 files changed

Lines changed: 3 additions & 9 deletions

File tree

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ project(milvus_sdk LANGUAGES CXX)
2020
set(CMAKE_POLICY_VERSION_MINIMUM 3.5)
2121
set(CMAKE_VERBOSE_MAKEFILE OFF)
2222
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
23-
set(CMAKE_CXX_STANDARD 14)
23+
set(CMAKE_CXX_STANDARD 14 CACHE STRING "C++ standard used to build Milvus C++ SDK")
2424
set(CMAKE_CXX_STANDARD_REQUIRED ON)
2525

2626
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")

conanfile.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,6 @@ def validate(self):
6565
# The project currently builds with C++14.
6666
check_min_cppstd(self, 14)
6767

68-
def configure(self):
69-
# Ensure dependency graph variants match the project's C++ standard.
70-
# (Without this, Conan may resolve packages for gnu17 and then fail to
71-
# find compatible binaries.)
72-
self.settings.compiler.cppstd = "14"
73-
7468
def generate(self):
7569
tc = CMakeToolchain(self)
7670

scripts/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ DO_INSTALL="OFF"
3030
CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX:-/usr/local}
3131
BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-ON}
3232
BUILD_FROM_CONAN="ON"
33-
33+
CPPSTD=${CPPSTD:-14}
3434

3535
JOBS="${JOBS:-$(nproc 2>/dev/null || sysctl -n hw.logicalcpu 2>/dev/null || echo 3)}"
3636
if [ ${JOBS} -lt 3 ] ; then
@@ -133,7 +133,6 @@ if [[ "${BUILD_FROM_CONAN}" == "ON" ]]; then
133133
# Dependencies must come from Conan; external gRPC is not supported.
134134
# Users can override the Conan executable via CONAN.
135135
CONAN=${CONAN:-conan}
136-
CPPSTD=${CPPSTD:-14}
137136
CONAN_LIBCXX_SETTINGS=()
138137
if [[ -n "${CONAN_LIBCXX:-}" ]]; then
139138
CONAN_LIBCXX_SETTINGS+=("-s" "compiler.libcxx=${CONAN_LIBCXX}")
@@ -229,6 +228,7 @@ esac
229228
CMAKE_CMD="cmake \
230229
-DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN_FILE} \
231230
-DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
231+
-DCMAKE_CXX_STANDARD=${CPPSTD} \
232232
-DMILVUS_BUILD_TEST=${BUILD_TEST} \
233233
-DMILVUS_BUILD_COVERAGE=${BUILD_COVERAGE} \
234234
-DMILVUS_BUILD_EXAMPLES=${CMAKE_BUILD_EXAMPLES} \

0 commit comments

Comments
 (0)