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 a42e6443170 Fix/include thrift lib and headers in cpp client (#12734)
a42e6443170 is described below
commit a42e64431700ba97e58e4e05eaef419287f8060c
Author: Christofer Dutz <[email protected]>
AuthorDate: Thu Jun 13 11:32:40 2024 +0200
Fix/include thrift lib and headers in cpp client (#12734)
* fix: Hopefully fixed the build of the cpp-example on windows systems
* fix: Increase the timeout even more to finally make the build succeed.
* fix: Fix the build.
* chore: Fixed the assembly descriptor of the cpp-client to include the
thrift libs and header files.
---
iotdb-client/client-cpp/src/assembly/client-cpp.xml | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/iotdb-client/client-cpp/src/assembly/client-cpp.xml
b/iotdb-client/client-cpp/src/assembly/client-cpp.xml
index 9de99eae649..729fdadde23 100644
--- a/iotdb-client/client-cpp/src/assembly/client-cpp.xml
+++ b/iotdb-client/client-cpp/src/assembly/client-cpp.xml
@@ -33,13 +33,19 @@
<outputDirectory>include</outputDirectory>
</fileSet>
<fileSet>
-
<directory>${project.basedir}/../compile-tools/thrift/target/thrift-${thrift.version}/lib/cpp/src</directory>
+ <directory>${project.build.directory}/thrift/include</directory>
<includes>
- <include>**/*.h</include>
- <include>**/*.tcc</include>
+ <include>**</include>
</includes>
<outputDirectory>include</outputDirectory>
</fileSet>
+ <fileSet>
+ <directory>${project.build.directory}/thrift/lib</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ <outputDirectory>lib</outputDirectory>
+ </fileSet>
<fileSet>
<directory>${project.build.directory}/build/main</directory>
<includes>
