Fix C++ SDK CXX11 ABI propagation

Author: hongzhi-gao

.github/scripts/package-client-cpp-manylinux-glibc217.sh

@@ -69,7 +69,7 @@ cd "${GITHUB_WORKSPACE:?GITHUB_WORKSPACE is not set}"
 ./mvnw clean package -P with-cpp -pl iotdb-client/client-cpp -am -DskipTests \
   -Dspotless.skip=true \
   -Dclient.cpp.package.classifier="${PACKAGE_CLASSIFIER}" \
-  -Diotdb.extra.cxx.flags=-D_GLIBCXX_USE_CXX11_ABI=1
+  -Diotdb.cxx11.abi=1
 
 SO="iotdb-client/client-cpp/target/install/lib/libiotdb_session.so"
 test -f "${SO}"

iotdb-client/client-cpp/CMakeLists.txt

@@ -34,6 +34,8 @@ endif()
 
 set(IOTDB_EXTRA_CXX_FLAGS ""
     CACHE STRING "Extra flags appended to CMAKE_CXX_FLAGS")
+set(IOTDB_USE_CXX11_ABI ""
+    CACHE STRING "Set _GLIBCXX_USE_CXX11_ABI for GNU libstdc++ builds (empty keeps toolchain default)")
 
 if(NOT MSVC)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -g -O2")
@@ -47,6 +49,10 @@ if(MSVC)
     set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
 endif()
 
+if(IOTDB_USE_CXX11_ABI AND NOT IOTDB_USE_CXX11_ABI MATCHES "^[01]$")
+    message(FATAL_ERROR "IOTDB_USE_CXX11_ABI must be empty, 0, or 1")
+endif()
+
 option(WITH_SSL "Build with OpenSSL support" OFF)
 option(BUILD_TESTING "Build IT test executables" OFF)
 option(IOTDB_OFFLINE "Disable all network access during configure" OFF)
@@ -116,6 +122,10 @@ endif()
 add_dependencies(iotdb_session iotdb_thrift_external iotdb_thrift_codegen)
 
 target_compile_definitions(iotdb_session PRIVATE THRIFT_STATIC_DEFINE IOTDB_BUILDING_SHARED)
+if(IOTDB_USE_CXX11_ABI AND NOT MSVC)
+    target_compile_definitions(iotdb_session PUBLIC
+            _GLIBCXX_USE_CXX11_ABI=${IOTDB_USE_CXX11_ABI})
+endif()
 
 target_include_directories(iotdb_session
         PUBLIC
@@ -186,9 +196,16 @@ foreach(_hdr IN LISTS IOTDB_PUBLIC_HEADERS)
 endforeach()
 
 set(IOTDB_SESSION_PC_LIBS "-liotdb_session")
+set(IOTDB_SESSION_PC_CFLAGS "")
+set(IOTDB_SESSION_CXX11_ABI_COMPILE_DEFINITION "")
 if(UNIX)
     set(IOTDB_SESSION_PC_LIBS "${IOTDB_SESSION_PC_LIBS} -pthread")
 endif()
+if(IOTDB_USE_CXX11_ABI AND NOT MSVC)
+    set(IOTDB_SESSION_PC_CFLAGS "-D_GLIBCXX_USE_CXX11_ABI=${IOTDB_USE_CXX11_ABI}")
+    set(IOTDB_SESSION_CXX11_ABI_COMPILE_DEFINITION
+            "_GLIBCXX_USE_CXX11_ABI=${IOTDB_USE_CXX11_ABI}")
+endif()
 configure_file(
         "${CMAKE_CURRENT_SOURCE_DIR}/cmake/iotdb-session-config.cmake.in"
         "${CMAKE_BINARY_DIR}/package-metadata/cmake/iotdb-session-config.cmake"
@@ -224,6 +241,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/package-metadata/BUILD-INFO.txt"
         "cmake.build.type=${CMAKE_BUILD_TYPE}\n"
         "with.ssl=${WITH_SSL}\n"
         "iotdb.offline=${IOTDB_OFFLINE}\n"
+        "iotdb.use.cxx11.abi=${IOTDB_USE_CXX11_ABI}\n"
         "iotdb.extra.cxx.flags=${IOTDB_EXTRA_CXX_FLAGS}\n")
 install(FILES "${CMAKE_BINARY_DIR}/package-metadata/cmake/iotdb-session-config.cmake"
         DESTINATION cmake)
@@ -245,6 +263,7 @@ message(STATUS "iotdb_session configuration summary:")
 message(STATUS "    WITH_SSL              = ${WITH_SSL}")
 message(STATUS "    BUILD_TESTING         = ${BUILD_TESTING}")
 message(STATUS "    IOTDB_OFFLINE         = ${IOTDB_OFFLINE}")
+message(STATUS "    IOTDB_USE_CXX11_ABI   = ${IOTDB_USE_CXX11_ABI}")
 message(STATUS "    IOTDB_DEPS_DIR        = ${IOTDB_DEPS_DIR}")
 message(STATUS "    BOOST_INCLUDE_DIR     = ${BOOST_INCLUDE_DIR} (Thrift build only)")
 message(STATUS "    THRIFT_INCLUDE_DIR    = ${THRIFT_INCLUDE_DIR}")

iotdb-client/client-cpp/cmake/FetchThrift.cmake

@@ -123,6 +123,9 @@ if(MSVC)
             "-DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL")
 else()
     set(_thrift_cxxflags "-fPIC")
+    if(IOTDB_USE_CXX11_ABI)
+        set(_thrift_cxxflags "${_thrift_cxxflags} -D_GLIBCXX_USE_CXX11_ABI=${IOTDB_USE_CXX11_ABI}")
+    endif()
     list(APPEND _thrift_cmake_args
             "-DCMAKE_C_FLAGS=-fPIC"
             "-DCMAKE_CXX_FLAGS=${_thrift_cxxflags}")
@@ -139,7 +142,12 @@ endif()
 # invoking cmake twice via execute_process and only register a phony
 # ExternalProject for dependency ordering.
 
-set(_thrift_stamp "${_thrift_build}/.built-${THRIFT_VERSION}-mdll")
+if(IOTDB_USE_CXX11_ABI)
+    set(_thrift_abi_stamp "-abi${IOTDB_USE_CXX11_ABI}")
+else()
+    set(_thrift_abi_stamp "-abidefault")
+endif()
+set(_thrift_stamp "${_thrift_build}/.built-${THRIFT_VERSION}-mdll${_thrift_abi_stamp}")
 if(NOT EXISTS "${_thrift_stamp}")
     file(MAKE_DIRECTORY "${_thrift_build}")
     message(STATUS "[Thrift] configuring ${_thrift_dirname}")

iotdb-client/client-cpp/cmake/iotdb-session-config.cmake.in

@@ -34,6 +34,10 @@ if(NOT TARGET IoTDB::iotdb_session)
     add_library(IoTDB::iotdb_session SHARED IMPORTED)
     set_target_properties(IoTDB::iotdb_session PROPERTIES
             INTERFACE_INCLUDE_DIRECTORIES "${_IOTDB_SESSION_PACKAGE_ROOT}/include")
+    if("@IOTDB_SESSION_CXX11_ABI_COMPILE_DEFINITION@")
+        set_target_properties(IoTDB::iotdb_session PROPERTIES
+                INTERFACE_COMPILE_DEFINITIONS "@IOTDB_SESSION_CXX11_ABI_COMPILE_DEFINITION@")
+    endif()
     if(UNIX)
         set_target_properties(IoTDB::iotdb_session PROPERTIES
                 INTERFACE_LINK_LIBRARIES Threads::Threads)

iotdb-client/client-cpp/cmake/iotdb-session.pc.in

@@ -23,4 +23,4 @@ Name: iotdb-session-cpp
 Description: Apache IoTDB C++ session client
 Version: @IOTDB_SESSION_VERSION@
 Libs: -L${libdir} @IOTDB_SESSION_PC_LIBS@
-Cflags: -I${includedir}
+Cflags: -I${includedir} @IOTDB_SESSION_PC_CFLAGS@

iotdb-client/client-cpp/examples/CMakeLists.txt

@@ -78,6 +78,7 @@ ELSE()
 ENDIF()
 
 if(NOT _iotdb_examples_in_tree)
+    find_package(iotdb-session CONFIG QUIET PATHS "${IOTDB_SDK_ROOT}" NO_DEFAULT_PATH)
     if(WIN32)
         set(_iotdb_link_lib "${IOTDB_SDK_ROOT}/lib/iotdb_session.lib")
         set(_iotdb_runtime   "${IOTDB_SDK_ROOT}/lib/iotdb_session.dll")
@@ -94,6 +95,10 @@ if(NOT _iotdb_examples_in_tree)
             "IoTDB SDK not found at ${IOTDB_SDK_ROOT}. "
             "Unpack iotdb-session-cpp-<version>-<classifier>.zip so that ${_iotdb_link_lib} exists.")
     endif()
+
+    if(TARGET IoTDB::iotdb_session)
+        set(_iotdb_link_lib IoTDB::iotdb_session)
+    endif()
 endif()
 
 ADD_EXECUTABLE(SessionExample SessionExample.cpp)

iotdb-client/client-cpp/pom.xml

@@ -50,6 +50,7 @@
         <iotdb.deps.dir>${project.basedir}/third-party</iotdb.deps.dir>
         <iotdb.offline>OFF</iotdb.offline>
         <with.ssl>OFF</with.ssl>
+        <iotdb.cxx11.abi/>
         <!-- Switched to OFF by the .skipTests profile below. -->
         <build.tests>ON</build.tests>
         <maven.test.skip>${ctest.skip.tests}</maven.test.skip>
@@ -113,6 +114,7 @@
                                 <option>-DWITH_SSL=${with.ssl}</option>
                                 <option>-DIOTDB_OFFLINE=${iotdb.offline}</option>
                                 <option>-DIOTDB_DEPS_DIR=${iotdb.deps.dir}</option>
+                                <option>-DIOTDB_USE_CXX11_ABI=${iotdb.cxx11.abi}</option>
                                 <option>-DBOOST_INCLUDEDIR=${boost.include.dir}</option>
                                 <option>-DCMAKE_POLICY_DEFAULT_CMP0091=NEW</option>
                                 <option>-DIOTDB_EXTRA_CXX_FLAGS=${iotdb.extra.cxx.flags}</option>