You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2024/04/25 09:08:59 UTC
(iotdb) branch helishi_client updated: fix error
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch helishi_client
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/helishi_client by this push:
new 2352f50d93f fix error
2352f50d93f is described below
commit 2352f50d93f739d42528cca1953881e308244f39
Author: HTHou <hh...@outlook.com>
AuthorDate: Thu Apr 25 17:08:42 2024 +0800
fix error
---
example/client-cpp-example/src/CMakeLists.txt | 2 +-
iotdb-client/client-cpp/pom.xml | 88 +--------------------------
2 files changed, 2 insertions(+), 88 deletions(-)
diff --git a/example/client-cpp-example/src/CMakeLists.txt b/example/client-cpp-example/src/CMakeLists.txt
index d9380af6eb8..576f7c985a4 100644
--- a/example/client-cpp-example/src/CMakeLists.txt
+++ b/example/client-cpp-example/src/CMakeLists.txt
@@ -22,7 +22,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.7)
SET(CMAKE_CXX_STANDARD 11)
SET(CMAKE_CXX_STANDARD_REQUIRED ON)
SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
-
+ADD_DEFINITIONS(-D FMT_HEADER_ONLY)
# Add Thrift include directory
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/thrift/include)
# Add cpp-client include directory
diff --git a/iotdb-client/client-cpp/pom.xml b/iotdb-client/client-cpp/pom.xml
index 726e54bd5cb..deb0733cdaa 100644
--- a/iotdb-client/client-cpp/pom.xml
+++ b/iotdb-client/client-cpp/pom.xml
@@ -30,14 +30,6 @@
<packaging>pom</packaging>
<name>IoTDB: Client: Client for CPP</name>
<description>C++ client</description>
- <!-- TODO: The tests don't run, if distribution has not been built locally and fails without reasoning -->
- <properties>
- <catch2.url>https://github.com/catchorg/Catch2/releases/download/v2.13.7/catch.hpp</catch2.url>
- <cmake.build.type>Release</cmake.build.type>
- <!-- Default value of cmake root -->
- <cmake.root.dir>${project.build.directory}/dependency/cmake/</cmake.root.dir>
- <thrift.exec.absolute.path>${project.build.directory}/thrift/bin/${thrift.executable}</thrift.exec.absolute.path>
- </properties>
<dependencies>
<dependency>
<groupId>org.apache.iotdb</groupId>
@@ -48,29 +40,6 @@
</dependencies>
<build>
<plugins>
- <!-- Build and do session integration test -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-test-resources</id>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <phase>validate</phase>
- <configuration>
- <outputDirectory>${project.build.directory}/build/test</outputDirectory>
- <resources>
- <resource>
- <directory>${project.basedir}/src/test</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
@@ -97,25 +66,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>com.googlecode.maven-download-plugin</groupId>
- <artifactId>download-maven-plugin</artifactId>
- <executions>
- <!-- Download the Catch2 header file. -->
- <execution>
- <id>get-catch2</id>
- <goals>
- <goal>wget</goal>
- </goals>
- <phase>generate-resources</phase>
- <configuration>
- <url>${catch2.url}</url>
- <unpack>false</unpack>
- <outputDirectory>${project.build.directory}/build/test/catch2</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>com.coderplus.maven.plugins</groupId>
<artifactId>copy-rename-maven-plugin</artifactId>
@@ -206,22 +156,7 @@
</options>
</configuration>
</execution>
- <!-- Generate Cmake build directory to compile testing program -->
- <execution>
- <id>cmake-generate-test</id>
- <goals>
- <goal>generate</goal>
- </goals>
- <phase>test-compile</phase>
- <configuration>
- <generator>${cmake.generator}</generator>
- <sourcePath>${project.build.directory}/build/test</sourcePath>
- <targetPath>${project.build.directory}/build/test</targetPath>
- <options>
- <option>-DBOOST_INCLUDEDIR=${boost.include.dir}</option>
- </options>
- </configuration>
- </execution>
+
<!-- Actually executes the build -->
<execution>
<id>cmake-compile</id>
@@ -236,29 +171,8 @@
</configuration>
</execution>
<!-- Actually executes the testing compilation -->
- <execution>
- <id>cmake-compile-test</id>
- <goals>
- <goal>compile</goal>
- </goals>
- <phase>test-compile</phase>
- <configuration>
- <config>${cmake.build.type}</config>
- <projectDirectory>${project.build.directory}/build/test</projectDirectory>
- </configuration>
- </execution>
<!-- Run the integration test cases -->
<!-- TODO: This execution doesn't seem to respect the "skipTests" config -->
- <execution>
- <id>cmake-run-test</id>
- <goals>
- <goal>test</goal>
- </goals>
- <phase>integration-test</phase>
- <configuration>
- <buildDirectory>${project.build.directory}/build/test</buildDirectory>
- </configuration>
- </execution>
</executions>
</plugin>
<!--Package all C++ header files and client library-->