Skip to content

Commit ab488ea

Browse files
committed
Align with humble
1 parent cdb08c2 commit ab488ea

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

conda_build_config.yaml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@ python:
1515
python_impl:
1616
- cpython
1717

18-
c_compiler:
19-
- ${{ "vs2019" if win }}
20-
cxx_compiler:
21-
- ${{ "vs2019" if win }}
22-
2318
c_stdlib:
2419
- ${{ "sysroot" if linux }}
2520
- ${{ "macosx_deployment_target" if osx }}
@@ -28,3 +23,11 @@ c_stdlib_version:
2823
- ${{ "2.17" if linux }}
2924
- ${{ "10.14" if osx and x86_64 }}
3025
- ${{ "11.0" if osx and arm64 }}
26+
c_compiler:
27+
- ${{ "gcc" if linux }}
28+
- ${{ "clang" if osx }}
29+
- ${{ "vs2019" if win }}
30+
cxx_compiler:
31+
- ${{ "gxx" if linux }}
32+
- ${{ "clangxx" if osx }}
33+
- ${{ "vs2019" if win }}

patch/dependencies.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ intra_process_demo:
3434
add_host: ["REQUIRE_OPENGL"]
3535
rviz_ogre_vendor:
3636
add_host: ["zlib", "freeimage", "freetype", "assimp", "zziplib", "pugixml", "${{ 'libglu' if linux }}"]
37-
add_build: ["vcstool", "patch"]
37+
add_build: ["vcstool"]
3838
add_run: ["assimp"]
3939
pcl_conversions:
4040
add_host: ["REQUIRE_OPENGL", "libboost-devel"]

pixi.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ upload = "anaconda -t $ANACONDA_API_TOKEN upload"
1616

1717
[dependencies]
1818
python = ">=3.11.0,<3.12"
19-
rattler-build = ">=0.33"
19+
rattler-build = ">=0.33.2"
2020
anaconda-client = ">=1.12"
2121

2222
[target.win-64.dependencies]

0 commit comments

Comments
 (0)