Skip to content

Commit

Permalink
Merge pull request #36 from regro-cf-autotick-bot/6.13.0_h13812e
Browse files Browse the repository at this point in the history
dartsim v6.13.0
  • Loading branch information
traversaro authored Jan 1, 2023
2 parents a1daf01 + 2fdc79f commit c765f62
Show file tree
Hide file tree
Showing 12 changed files with 34 additions and 41 deletions.
6 changes: 5 additions & 1 deletion .azure-pipelines/azure-pipelines-win.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ boost_cpp:
c_compiler:
- gcc
c_compiler_version:
- '10'
- '11'
cdt_name:
- cos6
channel_sources:
Expand All @@ -17,7 +17,7 @@ console_bridge:
cxx_compiler:
- gxx
cxx_compiler_version:
- '10'
- '11'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
flann:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ boost_cpp:
c_compiler:
- gcc
c_compiler_version:
- '10'
- '11'
cdt_arch:
- aarch64
cdt_name:
Expand All @@ -21,7 +21,7 @@ console_bridge:
cxx_compiler:
- gxx
cxx_compiler_version:
- '10'
- '11'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
flann:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/linux_ppc64le_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ boost_cpp:
c_compiler:
- gcc
c_compiler_version:
- '10'
- '11'
cdt_name:
- cos7
channel_sources:
Expand All @@ -17,7 +17,7 @@ console_bridge:
cxx_compiler:
- gxx
cxx_compiler_version:
- '10'
- '11'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
flann:
Expand Down
9 changes: 0 additions & 9 deletions .ci_support/migrations/boost1780.yaml

This file was deleted.

8 changes: 0 additions & 8 deletions .ci_support/migrations/console_bridge10.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion .circleci/config.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .scripts/build_steps.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions .scripts/run_osx_build.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions recipe/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ else
fi


if [[ "${target_platform}" == osx-* ]]; then
# See https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk
CXXFLAGS="${CXXFLAGS} -D_LIBCPP_DISABLE_AVAILABILITY"
fi


cmake ${CMAKE_ARGS} $SRC_DIR \
-DCMAKE_INSTALL_PREFIX=$PREFIX \
Expand Down
12 changes: 7 additions & 5 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
{% set name = "dartsim" %}
{% set version = "6.12.2" %}
{% set version = "6.13.0" %}

package:
name: {{ name }}
version: {{ version }}

source:
- url: https://github.com/dartsim/dart/archive/v{{ version }}.tar.gz
sha256: db1b3ef888d37f0dbc567bc291ab2cdb5699172523a58dd5a5fe513ee38f83b0
sha256: 4da3ff8cee056252a558b05625a5ff29b21e71f2995e6d7f789abbf6261895f7
patches:
- disable_imgui.patch
- disable_gui.patch
- disable_test_Issue1596.patch

build:
number: 3
number: 0
run_exports:
- {{ pin_subpackage(name, max_pin='x.x') }}

Expand All @@ -28,9 +28,9 @@ requirements:
- ninja # [win]
- perl # [win]


host:
- assimp
- boost-cpp
- bullet-cpp
- console_bridge
- eigen
Expand All @@ -43,9 +43,11 @@ requirements:
- tinyxml2
- urdfdom
- freeglut # [win]
- fmt
- spdlog


run:
- boost-cpp
- eigen
- flann
- lz4-c
Expand Down

0 comments on commit c765f62

Please sign in to comment.