Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ project(milvus_sdk LANGUAGES CXX)
set(CMAKE_POLICY_VERSION_MINIMUM 3.5)
set(CMAKE_VERBOSE_MAKEFILE OFF)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD 14 CACHE STRING "C++ standard used to build Milvus C++ SDK")
set(CMAKE_CXX_STANDARD_REQUIRED ON)

set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
Expand Down
6 changes: 0 additions & 6 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,6 @@ def validate(self):
# The project currently builds with C++14.
check_min_cppstd(self, 14)

def configure(self):
# Ensure dependency graph variants match the project's C++ standard.
# (Without this, Conan may resolve packages for gnu17 and then fail to
# find compatible binaries.)
self.settings.compiler.cppstd = "14"

def generate(self):
tc = CMakeToolchain(self)

Expand Down
4 changes: 2 additions & 2 deletions scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ DO_INSTALL="OFF"
CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX:-/usr/local}
BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-ON}
BUILD_FROM_CONAN="ON"

CPPSTD=${CPPSTD:-14}

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