Skip to content

Commit

Permalink
Modifications to compile Python part of gz-msgs10
Browse files Browse the repository at this point in the history
  • Loading branch information
traversaro committed Oct 4, 2023
1 parent 26c1d40 commit be1f7e3
Show file tree
Hide file tree
Showing 13 changed files with 706 additions and 72 deletions.
6 changes: 4 additions & 2 deletions conda-forge.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
bot:
abi_migration_branches:
- 'v9'
automerge: true
build_platform:
linux_aarch64: linux_aarch64
linux_ppc64le: linux_ppc64le
linux_aarch64: linux_64
linux_ppc64le: linux_64
osx_arm64: osx_64
conda_build:
pkg_format: '2'
Expand Down
24 changes: 24 additions & 0 deletions recipe/391.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
From 690d2a65eae3c968e82d47f62aee1234548163a6 Mon Sep 17 00:00:00 2001
From: Silvio Traversaro <[email protected]>
Date: Mon, 2 Oct 2023 11:29:01 +0200
Subject: [PATCH] Set GZ_TOOLS_VER to 2 for consistency with rest of Garden and
Harmonic libraries

Signed-off-by: Silvio Traversaro <[email protected]>
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2a9e8ed0..7a4a6699 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -97,7 +97,7 @@ set(GZ_MATH_VER ${gz-math7_VERSION_MAJOR})
# Note that CLI files are installed regardless of whether the dependency is
# available during build time
find_program(HAVE_GZ_TOOLS gz)
-set(GZ_TOOLS_VER 1)
+set(GZ_TOOLS_VER 2)

#--------------------------------------
# Find Tinyxml2
Loading

0 comments on commit be1f7e3

Please sign in to comment.