From 5be4a1ff3d1403786d4d1e7c152cd55731f9ae0f Mon Sep 17 00:00:00 2001 From: Dexton Anderson Date: Tue, 26 Nov 2024 09:39:45 -0600 Subject: [PATCH] Build against SOEM 1.4.0, bump soemJava version --- Dockerfile-arm64_cross | 1 + Dockerfile-x86_64 | 1 + swig/build.gradle.kts.in | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile-arm64_cross b/Dockerfile-arm64_cross index 14e9b0d..18c9f40 100644 --- a/Dockerfile-arm64_cross +++ b/Dockerfile-arm64_cross @@ -37,6 +37,7 @@ ENV PATH=$PATH:$JAVA_HOME/bin WORKDIR /opt RUN git clone https://github.com/OpenEtherCATsociety/SOEM.git WORKDIR /opt/SOEM +RUN git checkout v1.4.0 RUN mkdir build && cd build WORKDIR /opt/SOEM/build RUN cmake -DCMAKE_C_COMPILER=aarch64-linux-gnu-gcc \ diff --git a/Dockerfile-x86_64 b/Dockerfile-x86_64 index 7af2e7e..ebbc6c5 100644 --- a/Dockerfile-x86_64 +++ b/Dockerfile-x86_64 @@ -34,6 +34,7 @@ ENV PATH=$PATH:$JAVA_HOME/bin WORKDIR /opt RUN git clone https://github.com/OpenEtherCATsociety/SOEM.git WORKDIR /opt/SOEM +RUN git checkout v1.4.0 RUN mkdir build && cd build WORKDIR /opt/SOEM/build RUN cmake -DHOST_INSTALL="" -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_POSITION_INDEPENDENT_CODE=true -DCMAKE_BUILD_TYPE=Release .. diff --git a/swig/build.gradle.kts.in b/swig/build.gradle.kts.in index 8355f28..33d8a06 100644 --- a/swig/build.gradle.kts.in +++ b/swig/build.gradle.kts.in @@ -5,7 +5,7 @@ plugins { ihmc { group = "us.ihmc" - version = "1.5.0" + version = "1.5.1" vcsUrl = "https://github.com/ihmcrobotics/ihmc-ethercat-master" openSource = true