[incubator-plc4x] branch develop updated: - Cleaned up the properties - Made the CMakeLists.txt no longer contain two versions of the include path - Integrated the C++ module into the main build (but is only included, if the "with-cpp" profile is manually enabled)

[cd...@apache.org]

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/incubator-plc4x.git


The following commit(s) were added to refs/heads/develop by this push:
     new dc22e1c  - Cleaned up the properties - Made the CMakeLists.txt no longer contain two versions of the include path - Integrated the C++ module into the main build (but is only included, if the "with-cpp" profile is manually enabled)
dc22e1c is described below

commit dc22e1cbacd7569fa706d5eb3a6740f4aa3e1e66
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Thu Jan 3 15:52:52 2019 +0100

    - Cleaned up the properties
    - Made the CMakeLists.txt no longer contain two versions of the include path
    - Integrated the C++ module into the main build (but is only included, if the "with-cpp" profile is manually enabled)
---
 plc4cpp/api/src/main/cmake/CMakeLists.txt | 9 ++-------
 plc4cpp/pom.xml                           | 4 +++-
 pom.xml                                   | 8 ++++++++
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/plc4cpp/api/src/main/cmake/CMakeLists.txt b/plc4cpp/api/src/main/cmake/CMakeLists.txt
index 0d09718..45b4ab6 100644
--- a/plc4cpp/api/src/main/cmake/CMakeLists.txt
+++ b/plc4cpp/api/src/main/cmake/CMakeLists.txt
@@ -70,12 +70,7 @@ add_library(api ../../src/main/cpp/org/apache/plc4x/cpp/api/PlcConnection.cpp
         )
 
 #[[
-    Import for non-windows systems
+    Import the boost headers
 ]]
-target_include_directories (api PUBLIC ../../../libs/libs/boost/include)
-
-#[[
-    Import for windows systems
-]]
-target_include_directories (api PUBLIC ../../../libs/libs/boost/include/boost-${boost.version.underline-short})
+target_include_directories (api PUBLIC ../../../${boost.include-directory})
 
diff --git a/plc4cpp/pom.xml b/plc4cpp/pom.xml
index abc53a8..dad94e2 100644
--- a/plc4cpp/pom.xml
+++ b/plc4cpp/pom.xml
@@ -35,9 +35,10 @@
 
   <properties>
     <boost.version>1.69.0</boost.version>
-    <boost.version.underline>1_69_0</boost.version.underline>
     <boost.version.underline-short>1_69</boost.version.underline-short>
+    <boost.version.underline>${boost.version.underline-short}_0</boost.version.underline>
     <boost.working-directory>${project.build.directory}/libs/boost_${boost.version.underline}</boost.working-directory>
+    <boost.include-directory>libs/libs/boost/include</boost.include-directory>
   </properties>
 
   <modules>
@@ -124,6 +125,7 @@
         <boost.url>https://dl.bintray.com/boostorg/release/${boost.version}/source/boost_${boost.version.underline}.zip</boost.url>
         <boost.bootstrap.executable>bootstrap.bat</boost.bootstrap.executable>
         <boost.build.executable>${boost.working-directory}/b2.exe</boost.build.executable>
+        <boost.include-directory>libs/libs/boost/include/boost-${boost.version.underline-short}</boost.include-directory>
       </properties>
     </profile>
     <!--
diff --git a/pom.xml b/pom.xml
index 330245d..065feff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1082,6 +1082,14 @@
   </reporting>
 
   <profiles>
+    <!-- Build PLC4X including the CPP modules -->
+    <profile>
+      <id>with-cpp</id>
+      <modules>
+        <module>plc4cpp</module>
+      </modules>
+    </profile>
+
     <profile>
       <id>debug-pom</id>
       <build>