Expose CPPSTD configuration (#507)

Signed-off-by: yhmo <yihua.mo@zilliz.com>

Author: yhmo

CMakeLists.txt

@@ -20,8 +20,14 @@ 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)
+if (NOT CMAKE_CXX_STANDARD MATCHES "^[0-9]+$")
+    message(FATAL_ERROR "CMAKE_CXX_STANDARD must be a numeric C++ standard value, such as 14, 17, or 20")
+endif()
+if (CMAKE_CXX_STANDARD LESS 14)
+    message(FATAL_ERROR "milvus-sdk-cpp requires C++14 or newer (got CMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD})")
+endif()
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 set(BUILD_SCRIPTS_DIR ${PROJECT_SOURCE_DIR}/scripts)

conanfile.py

@@ -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)
 

examples/CMakeLists.txt

@@ -17,9 +17,6 @@
 cmake_minimum_required(VERSION 3.5)
 project(milvus_sdk_example LANGUAGES CXX C)
 
-set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_CXX_STANDARD_REQUIRED on)
-
 message(STATUS "  CMAKE_SOURCE_DIR: ${CMAKE_SOURCE_DIR}")
 include_directories(${CMAKE_SOURCE_DIR}/src/include)
 

scripts/build.sh

@@ -30,7 +30,11 @@ 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}
+if [[ ! "${CPPSTD}" =~ ^[0-9]+$ ]]; then
+  echo "ERROR! CPPSTD must be a numeric C++ standard value, such as 14, 17, or 20"
+  exit 1
+fi
 
 JOBS="${JOBS:-$(nproc 2>/dev/null || sysctl -n hw.logicalcpu 2>/dev/null || echo 3)}"
 if [ ${JOBS} -lt 3 ] ; then
@@ -133,7 +137,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}")
@@ -229,6 +232,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} \

src/impl/MilvusClientV2Impl.cpp

@@ -849,8 +849,8 @@ MilvusClientV2Impl::LoadPartitions(const LoadPartitionsRequest& request) {
                 auto db_name = connection_.CurrentDbName(request.DatabaseName());
                 uint32_t loading_progress = 0;
                 uint32_t refresh_progress = 0;
-                auto status = connection_.GetLoadingProgress(db_name, request.CollectionName(), request.PartitionNames(),
-                                                             loading_progress, refresh_progress);
+                auto status = connection_.GetLoadingProgress(
+                    db_name, request.CollectionName(), request.PartitionNames(), loading_progress, refresh_progress);
                 if (!status.IsOk()) {
                     return status;
                 }

src/impl/utils/ConnectionHandler.h

@@ -65,8 +65,8 @@ class ConnectionHandler {
     // This interface is not exposed to users
     Status
     GetLoadingProgress(const std::string& db_name, const std::string& collection_name,
-                       const std::set<std::string>& partition_names, uint32_t& progress,
-                       uint32_t& refresh_progress, uint64_t rpc_timeout_ms = 0);
+                       const std::set<std::string>& partition_names, uint32_t& progress, uint32_t& refresh_progress,
+                       uint64_t rpc_timeout_ms = 0);
 
     /**
      * Internal wait for status query done.