You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2019/10/26 01:04:23 UTC
[plc4x] branch develop updated: - Fixed the way the Thrift build
finds the boost build from plc4x
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
The following commit(s) were added to refs/heads/develop by this push:
new d1629cb - Fixed the way the Thrift build finds the boost build from plc4x
d1629cb is described below
commit d1629cbcd0b283d285f3ec6f4247070ed39c93e2
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Sat Oct 26 03:04:14 2019 +0200
- Fixed the way the Thrift build finds the boost build from plc4x
---
pom.xml | 2 +-
tools/thrift/pom.xml | 36 ++++++++++++++++++++++++++++++------
2 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 77c1d6d..5f62ebf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,7 +112,7 @@
<boost.version.underline-short>1_71</boost.version.underline-short>
<boost.version.underline>${boost.version.underline-short}_0</boost.version.underline>
<byte-buddy.version>1.9.10</byte-buddy.version>
- <cmake-version>3.14.5</cmake-version>
+ <cmake-version>3.15.4</cmake-version>
<commons-codec.version>1.12</commons-codec.version>
<commons-collections4.version>4.1</commons-collections4.version>
<commons-configuration2.version>2.6</commons-configuration2.version>
diff --git a/tools/thrift/pom.xml b/tools/thrift/pom.xml
index 6fdee16..6a74e72 100644
--- a/tools/thrift/pom.xml
+++ b/tools/thrift/pom.xml
@@ -210,6 +210,33 @@
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-boost</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.plc4x</groupId>
+ <artifactId>plc4x-tools-boost</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ <classifier>lib-${os.classifier}</classifier>
+ <overWrite>true</overWrite>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/boost</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
<groupId>com.googlecode.cmake-maven-project</groupId>
<artifactId>cmake-maven-plugin</artifactId>
<version>3.7.2-b1</version>
@@ -248,12 +275,9 @@
<option>-DBUILD_JAVA=OFF</option>
<option>-DBUILD_PYTHON=${thrift.with.python}</option>
<option>-DBUILD_HASKELL=OFF</option>
- <!--
- Forcefully disable Boost detection as we don't need it and
- having Boost 1.70 available breaks the Thrift build.
- Boost would be needed, if we were planning on running tests.
- -->
- <!--option>-DBoost_NO_BOOST_CMAKE=ON</option-->
+ <!-- Tell CMake where our boost includes and libs are located -->
+ <option>-DBOOST_INCLUDEDIR=${project.build.directory}/boost/include</option>
+ <option>-DBOOST_LIBRARYDIR=${project.build.directory}/boost/lib</option>
</options>
</configuration>
</execution>