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 2022/09/06 13:21:18 UTC
[plc4x] branch develop updated: fix(plc4j/ui): Tried to get the build working on windows
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 56d0b8877 fix(plc4j/ui): Tried to get the build working on windows
56d0b8877 is described below
commit 56d0b887703fc1404865f61254aefadadf4fea8a
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Tue Sep 6 15:21:09 2022 +0200
fix(plc4j/ui): Tried to get the build working on windows
---
plc4j/tools/ui/pom.xml | 8 ++++----
pom.xml | 14 +++++++-------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/plc4j/tools/ui/pom.xml b/plc4j/tools/ui/pom.xml
index 81ab0d531..6ada85b27 100644
--- a/plc4j/tools/ui/pom.xml
+++ b/plc4j/tools/ui/pom.xml
@@ -95,25 +95,25 @@
<groupId>org.openjfx</groupId>
<artifactId>javafx-base</artifactId>
<version>${javafx.version}</version>
- <classifier>${javafx.classifier}</classifier>
+ <classifier>${javafx.platform}</classifier>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-graphics</artifactId>
<version>${javafx.version}</version>
- <classifier>${javafx.classifier}</classifier>
+ <classifier>${javafx.platform}</classifier>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-controls</artifactId>
<version>${javafx.version}</version>
- <classifier>${javafx.classifier}</classifier>
+ <classifier>${javafx.platform}</classifier>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-fxml</artifactId>
<version>${javafx.version}</version>
- <classifier>${javafx.classifier}</classifier>
+ <classifier>${javafx.platform}</classifier>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 802164ba4..49671957d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1583,7 +1583,7 @@
<cmake.root>${project.build.directory}/cmake-${cmake-version}-linux-x86_64/bin/</cmake.root>
<cmake.generator>Unix Makefiles</cmake.generator>
<python.venv.bin>venv/bin/</python.venv.bin>
- <javafx.classifier>linux</javafx.classifier>
+ <javafx.platform>linux</javafx.platform>
</properties>
</profile>
<!-- Profile for linux x86_64 (Self-Enabling) -->
@@ -1602,7 +1602,7 @@
<cmake.root>${project.build.directory}/cmake-${cmake-version}-linux-x86_64/bin/</cmake.root>
<cmake.generator>Unix Makefiles</cmake.generator>
<python.venv.bin>venv/bin/</python.venv.bin>
- <javafx.classifier>linux</javafx.classifier>
+ <javafx.platform>linux</javafx.platform>
</properties>
</profile>
<!-- Profile for linux aarch64 (Self-Enabling) -->
@@ -1621,7 +1621,7 @@
<cmake.root>${project.build.directory}/cmake-${cmake-version}-linux-${os.arch}/bin/</cmake.root>
<cmake.generator>Unix Makefiles</cmake.generator>
<python.venv.bin>venv/bin/</python.venv.bin>
- <javafx.classifier>linux-aarch64</javafx.classifier>
+ <javafx.platform>linux-aarch64</javafx.platform>
</properties>
</profile>
<!-- Profile for mac amd64 (Self-Enabling) -->
@@ -1640,7 +1640,7 @@
<cmake.root>${project.build.directory}/cmake-${cmake-version}-macos-universal/CMake.app/Contents/bin</cmake.root>
<cmake.generator>Unix Makefiles</cmake.generator>
<python.venv.bin>venv/bin/</python.venv.bin>
- <javafx.classifier>mac</javafx.classifier>
+ <javafx.platform>mac</javafx.platform>
</properties>
</profile>
<!-- Profile for mac x86_64 (Self-Enabling) -->
@@ -1659,7 +1659,7 @@
<cmake.root>${project.build.directory}/cmake-${cmake-version}-macos-universal/CMake.app/Contents/bin</cmake.root>
<cmake.generator>Unix Makefiles</cmake.generator>
<python.venv.bin>venv/bin/</python.venv.bin>
- <javafx.classifier>mac</javafx.classifier>
+ <javafx.platform>mac</javafx.platform>
</properties>
</profile>
<!-- Profile for mac (Self-Enabling) -->
@@ -1678,7 +1678,7 @@
<cmake.root>${project.build.directory}/cmake-${cmake-version}-macos-universal/CMake.app/Contents/bin</cmake.root>
<cmake.generator>Unix Makefiles</cmake.generator>
<python.venv.bin>venv/bin/</python.venv.bin>
- <javafx.classifier>mac-aarch64</javafx.classifier>
+ <javafx.platform>mac-aarch64</javafx.platform>
</properties>
</profile>
<!-- profile for windows (Self-Enabling) -->
@@ -1696,7 +1696,7 @@
<cmake.root>${project.build.directory}/cmake-${cmake-version}-windows-x86_64/bin</cmake.root>
<cmake.generator>MinGW Makefiles</cmake.generator>
<python.venv.bin>venv/Scripts/</python.venv.bin>
- <javafx.classifier>win-x86</javafx.classifier>
+ <javafx.platform>win-x86</javafx.platform>
</properties>
</profile>