This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new ea3cc3cbdef Cpp client supports visual studio 2026 (#17218)
ea3cc3cbdef is described below
commit ea3cc3cbdef5a354d2db89007681f4e0b707e331
Author: Haonan <[email protected]>
AuthorDate: Wed Mar 11 12:12:50 2026 +0800
Cpp client supports visual studio 2026 (#17218)
* Cpp client supports visual studio 2026
* fix ci
* fix ci
* fix 2026
---
.github/workflows/multi-language-client.yml | 8 ++++++--
.mvn/wrapper/maven-wrapper.properties | 2 +-
example/client-cpp-example/pom.xml | 4 ++--
iotdb-client/client-cpp/pom.xml | 16 ++++++++--------
pom.xml | 4 ++--
5 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/.github/workflows/multi-language-client.yml
b/.github/workflows/multi-language-client.yml
index 9ed5d0509c0..dc2fca9602b 100644
--- a/.github/workflows/multi-language-client.yml
+++ b/.github/workflows/multi-language-client.yml
@@ -45,7 +45,7 @@ jobs:
fail-fast: false
max-parallel: 15
matrix:
- os: [ubuntu-22.04, ubuntu-24.04, windows-2022, windows-latest,
macos-latest]
+ os: [ubuntu-22.04, ubuntu-24.04, windows-2022, windows-latest,
windows-2025-vs2026, macos-latest]
runs-on: ${{ matrix.os}}
steps:
@@ -96,7 +96,11 @@ jobs:
# Explicitly using "install" instead of package in order to be sure
we're using libs built on this machine
# (was causing problems on windows, but could cause problem on linux,
when updating the thrift module)
run: |
- ./mvnw clean verify -P with-cpp -pl
iotdb-client/client-cpp,example/client-cpp-example -am
+ if [[ "${{ matrix.os }}" == "windows-2025-vs2026" ]]; then
+ ./mvnw clean verify -P with-cpp -pl
iotdb-client/client-cpp,example/client-cpp-example -am
-Dcmake.generator="Visual Studio 18 2026"
+ else
+ ./mvnw clean verify -P with-cpp -pl
iotdb-client/client-cpp,example/client-cpp-example -am
+ fi
- name: Upload Artifact
if: failure()
uses: actions/upload-artifact@v4
diff --git a/.mvn/wrapper/maven-wrapper.properties
b/.mvn/wrapper/maven-wrapper.properties
index 38b4fe1781a..ac504fa7b3a 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -15,5 +15,5 @@
# specific language governing permissions and limitations
# under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.12/apache-maven-3.9.12-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar
diff --git a/example/client-cpp-example/pom.xml
b/example/client-cpp-example/pom.xml
index c73f12a55df..d7df404dcde 100644
--- a/example/client-cpp-example/pom.xml
+++ b/example/client-cpp-example/pom.xml
@@ -128,7 +128,7 @@
</executions>
</plugin>
<plugin>
- <groupId>com.googlecode.cmake-maven-project</groupId>
+ <groupId>io.github.cmake-maven-plugin</groupId>
<artifactId>cmake-maven-plugin</artifactId>
<executions>
<execution>
@@ -140,7 +140,7 @@
<configuration>
<generator>${cmake.generator}</generator>
<sourcePath>${project.build.directory}</sourcePath>
- <targetPath>${project.build.directory}</targetPath>
+
<projectDirectory>${project.build.directory}</projectDirectory>
<options>
<option>-DBOOST_INCLUDEDIR=${boost.include.dir}</option>
</options>
diff --git a/iotdb-client/client-cpp/pom.xml b/iotdb-client/client-cpp/pom.xml
index bf0f92204e4..7f43fd77440 100644
--- a/iotdb-client/client-cpp/pom.xml
+++ b/iotdb-client/client-cpp/pom.xml
@@ -202,7 +202,7 @@
</executions>
</plugin>
<plugin>
- <groupId>com.googlecode.cmake-maven-project</groupId>
+ <groupId>io.github.cmake-maven-plugin</groupId>
<artifactId>cmake-maven-plugin</artifactId>
<executions>
<!-- Uses a CMake generator to generate the build using
the build tool of choice -->
@@ -215,7 +215,7 @@
<configuration>
<generator>${cmake.generator}</generator>
<sourcePath>${project.build.directory}/build/main</sourcePath>
-
<targetPath>${project.build.directory}/build/main</targetPath>
+
<projectDirectory>${project.build.directory}/build/main</projectDirectory>
<options>
<option>-DBOOST_INCLUDEDIR=${boost.include.dir}</option>
<option>-DWITH_SSL=${with.ssl}</option>
@@ -232,7 +232,7 @@
<configuration>
<generator>${cmake.generator}</generator>
<sourcePath>${project.build.directory}/build/test</sourcePath>
-
<targetPath>${project.build.directory}/build/test</targetPath>
+
<projectDirectory>${project.build.directory}/build/test</projectDirectory>
<options>
<option>-DBOOST_INCLUDEDIR=${boost.include.dir}</option>
<option>-DWITH_SSL=${with.ssl}</option>
@@ -273,8 +273,8 @@
</goals>
<phase>integration-test</phase>
<configuration>
-
<buildDirectory>${project.build.directory}/build/test</buildDirectory>
- <skipTests>${ctest.skip.tests}</skipTests>
+
<projectDirectory>${project.build.directory}/build/test</projectDirectory>
+ <skipTests>${maven.test.skip}</skipTests>
</configuration>
</execution>
</executions>
@@ -415,8 +415,8 @@
</os>
</activation>
<properties>
- <iotdb.start.script>start-standalone.bat</iotdb.start.script>
- <iotdb.stop.script>stop-standalone.bat</iotdb.stop.script>
+
<iotdb.start.script>windows/start-standalone.bat</iotdb.start.script>
+
<iotdb.stop.script>windows/stop-standalone.bat</iotdb.stop.script>
<os.suffix>win</os.suffix>
</properties>
</profile>
@@ -430,7 +430,7 @@
<build>
<plugins>
<plugin>
- <groupId>com.googlecode.cmake-maven-project</groupId>
+ <groupId>io.github.cmake-maven-plugin</groupId>
<artifactId>cmake-maven-plugin</artifactId>
<executions>
<execution>
diff --git a/pom.xml b/pom.xml
index 3573f6ec951..91e2f933a5a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -896,9 +896,9 @@
<version>1.7.1</version>
</plugin>
<plugin>
- <groupId>com.googlecode.cmake-maven-project</groupId>
+ <groupId>io.github.cmake-maven-plugin</groupId>
<artifactId>cmake-maven-plugin</artifactId>
- <version>3.29.3-b2</version>
+ <version>4.2.3-b1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
