Merge pull request #21 from regro-cf-autotick-bot/5_5.0.0_h92beea

libignition-physics v5_5.0.0
conda-forge · Oct 10, 2021 · e16126f · e16126f
2 parents 8585ec2 + dd16a75
commit e16126f
Show file tree

Hide file tree

Showing 12 changed files with 45 additions and 81 deletions.
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml
@@ -5,7 +5,7 @@ c_compiler_version:
 cdt_name:
 - cos6
 channel_sources:
-- conda-forge,defaults
+- conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:

diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml
@@ -5,7 +5,7 @@ c_compiler_version:
 cdt_name:
 - cos7
 channel_sources:
-- conda-forge,defaults
+- conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:

diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml
@@ -7,7 +7,7 @@ c_compiler:
 c_compiler_version:
 - '11'
 channel_sources:
-- conda-forge,defaults
+- conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:

diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml
@@ -1,7 +1,7 @@
 c_compiler:
 - vs2019
 channel_sources:
-- conda-forge,defaults
+- conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:

diff --git a/README.md b/README.md
diff --git a/recipe/249.patch b/recipe/249.patch
diff --git a/recipe/297.patch b/recipe/297.patch
@@ -0,0 +1,13 @@
+diff --git a/bullet/CMakeLists.txt b/bullet/CMakeLists.txt
+index 7402946b..ad1af1d5 100644
+--- a/bullet/CMakeLists.txt
++++ b/bullet/CMakeLists.txt
+@@ -34,7 +34,7 @@ set(versioned ${CMAKE_SHARED_LIBRARY_PREFIX}${bullet_plugin}${CMAKE_SHARED_LIBRA
+ set(unversioned ${CMAKE_SHARED_LIBRARY_PREFIX}${PROJECT_NAME_NO_VERSION_LOWER}-${engine_name}${CMAKE_SHARED_LIBRARY_SUFFIX})
+ if (WIN32)
+   # disable MSVC inherit via dominance warning
+-  target_compile_options(${dartsim_plugin} PUBLIC "/wd4250")
++  target_compile_options(${bullet_plugin} PUBLIC "/wd4250")
+   INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E copy
+       ${IGNITION_PHYSICS_ENGINE_INSTALL_DIR}\/${versioned}
+       ${IGNITION_PHYSICS_ENGINE_INSTALL_DIR}\/${unversioned})")
diff --git a/recipe/bld.bat b/recipe/bld.bat
@@ -14,7 +14,8 @@ cmake ^
 if errorlevel 1 exit 1
 
 :: Build.
-cmake --build . --config Release
+:: Only use one thread to avoid out of memory issues (https://github.com/conda-forge/libignition-physics-feedstock/pull/21#issuecomment-938662928)
+cmake --build . --parallel 1 --config Release
 if errorlevel 1 exit 1
 
 :: Install.

diff --git a/recipe/build.sh b/recipe/build.sh
@@ -29,5 +29,5 @@ if [ ${target_platform} != "linux-ppc64le" ]; then
   # Remove test that fail on arm64: https://github.com/ignitionrobotics/ign-physics/issues/70
   # Remove test that fail on macOS: https://github.com/conda-forge/libignition-physics-feedstock/issues/13
   # Remove test INTEGRATION_ExamplesBuild_TEST that fails on multiple platforms: https://github.com/conda-forge/libignition-physics-feedstock/pull/14
-  ctest --output-on-failure -C Release -E "INTEGRATION_FrameSemantics2d|INTEGRATION_JointTypes2f|UNIT_Collisions_TEST|UNIT_EntityManagement_TEST|UNIT_JointFeatures_TEST|UNIT_LinkFeatures_TEST|UNIT_SDFFeatures_TEST|UNIT_SimulationFeatures_TEST|INTEGRATION_ExamplesBuild_TEST|UNIT_WorldFeatures_TEST|UNIT_ShapeFeatures_TEST"
+  ctest --output-on-failure -C Release -E "INTEGRATION_FrameSemantics2d|INTEGRATION_JointTypes2f|UNIT_Collisions_TEST|UNIT_EntityManagement_TEST|UNIT_JointFeatures_TEST|UNIT_LinkFeatures_TEST|UNIT_SDFFeatures_TEST|UNIT_SimulationFeatures_TEST|INTEGRATION_ExamplesBuild_TEST|UNIT_WorldFeatures_TEST|UNIT_ShapeFeatures_TEST|UNIT_FreeGroupFeatures_TEST|UNIT_KinematicsFeatures_TEST"
 fi
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,5 +1,5 @@
 {% set base_name = "libignition-physics" %}
-{% set version = "4_4.1.0" %}
+{% set version = "5_5.0.0" %}
 {% set version_package = version.split('_')[1] %}
 {% set major_version = version_package.split('.')[0] %}
 {% set name = base_name + major_version %}
@@ -10,11 +10,11 @@ package:
 
 source:
   - url: https://github.com/ignitionrobotics/ign-physics/archive/ignition-physics{{ version }}.tar.gz
-    sha256: 5b0c9603e453e4c4b45d46d50903ed92b957d31cf21743da90fa3e787fda3a3e
+    sha256: e77ee0088911a5b379134466e79b7d842438378dc2b09a0fc6edf93efbe180a7
     patches:
       - vs2017_support.patch
       - disable_fake_install.patch
-      - 249.patch
+      - 297.patch
 
 build:
   number: 0
@@ -35,7 +35,7 @@ requirements:
     - libignition-math6
     - libignition-common4
     - libignition-utils1
-    - libsdformat11
+    - libsdformat12
     - eigen
     - dartsim
     - libode

diff --git a/recipe/vs2017_support.patch b/recipe/vs2017_support.patch
@@ -8,19 +8,19 @@ Subject: [PATCH] Update CMakeLists.txt
  1 file changed, 5 insertions(+)
 
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 3df39ced..86dffa19 100644
+index a22dd97f..4cb2d0a8 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -7,6 +7,12 @@ target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME}
-     ${ignition-math${IGN_MATH_VER}_LIBRARIES}
-     ignition-plugin${IGN_PLUGIN_VER}::register)
+@@ -9,6 +9,12 @@ target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME}
+     ignition-plugin${IGN_PLUGIN_VER}::register
+     Eigen3::Eigen)
 
 +if(MSVC)
-+  target_compile_definitions(${PROJECT_LIBRARY_TARGET_NAME} 
++  target_compile_definitions(${PROJECT_LIBRARY_TARGET_NAME}
 +    PUBLIC _ENABLE_EXTENDED_ALIGNED_STORAGE)
 +  target_compile_options(${PROJECT_LIBRARY_TARGET_NAME} PRIVATE /permissive-)
-+endif()  
++endif()
 +
- target_include_directories(${PROJECT_LIBRARY_TARGET_NAME}
-   SYSTEM PUBLIC
-     ${EIGEN3_INCLUDE_DIRS})
+ ign_build_tests(
+   TYPE UNIT
+   SOURCES ${gtest_sources})