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 2021/03/31 13:15:35 UTC
[plc4x] branch develop updated: - Made the integration test use the
matching version of CMake for the current operating system (Mac, Linux,
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 13579ee - Made the integration test use the matching version of CMake for the current operating system (Mac, Linux, Windows)
13579ee is described below
commit 13579ee12950faceb7576749cf43015873a84fa5
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Wed Mar 31 15:15:28 2021 +0200
- Made the integration test use the matching version of CMake for the current operating system (Mac, Linux, Windows)
---
.../language-c/src/test/resources/integration-test/pom.xml | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/build-utils/language-c/src/test/resources/integration-test/pom.xml b/build-utils/language-c/src/test/resources/integration-test/pom.xml
index 6b48e10..bdf467c 100644
--- a/build-utils/language-c/src/test/resources/integration-test/pom.xml
+++ b/build-utils/language-c/src/test/resources/integration-test/pom.xml
@@ -24,7 +24,7 @@
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4x-build-utils</artifactId>
<version>0.9.0-SNAPSHOT</version>
- <relativePath>../../../..</relativePath>
+ <relativePath>../../../../pom.xml</relativePath>
</parent>
<artifactId>plc4j-c-mspec-test</artifactId>
@@ -49,6 +49,15 @@
-->
<profiles>
+ <!-- Profile for windows -->
+ <profile>
+ <id>os-windows</id>
+ <activation>
+ <os>
+ <family>unix</family>
+ </os>
+ </activation>
+ </profile>
<!-- Profile for linux -->
<profile>
<id>os-unix</id>
@@ -110,7 +119,7 @@
<goal>wget</goal>
</goals>
<configuration>
- <url>https://github.com/Kitware/CMake/releases/download/v${cmake-version}/cmake-${cmake-version}-Linux-x86_64.tar.gz</url>
+ <url>${cmake.url}</url>
<unpack>true</unpack>
<outputDirectory>${project.build.directory}</outputDirectory>
</configuration>