diff --git a/recipe/bld.bat b/recipe/bld.bat index 20131c8..a41bceb 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -7,9 +7,15 @@ env REM add future installation path to pkgconfig set PKG_CONFIG_PATH=%LIBRARY_PREFIX%\lib\pkgconfig; +REM We pass -DODE_WITH_LIBCCD_BOX_CYL:BOOL=OFF for consistency with autotools builds that are +REM used by the ode packages of major linux distributions +REM https://github.com/conda-forge/dartsim-feedstock/issues/62 +REM https://bitbucket.org/odedevs/ode/src/bcfb66cd5e18e32e27cfaae3651ead930bbcda13/configure.ac#lines-428 +REM https://bitbucket.org/odedevs/ode/issues/87/box-cylinder-ccd-check-disabled-by-default cmake -G"NMake Makefiles" ^ -DODE_WITH_LIBCCD:BOOL=ON ^ -DODE_WITH_LIBCCD_SYSTEM:BOOL=ON ^ + -DODE_WITH_LIBCCD_BOX_CYL:BOOL=OFF ^ -DCMAKE_BUILD_TYPE=Release ^ -DODE_WITH_DEMOS:BOOL=OFF ^ -DODE_WITH_TESTS:BOOL=OFF ^ diff --git a/recipe/build.sh b/recipe/build.sh index 1598b0c..c8c230a 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -4,9 +4,15 @@ cp $BUILD_PREFIX/share/gnuconfig/config.* . mkdir _build cd _build +# We pass -DODE_WITH_LIBCCD_BOX_CYL:BOOL=OFF for consistency with autotools builds that are +# used by the ode packages of major linux distributions +# https://github.com/conda-forge/dartsim-feedstock/issues/62 +# https://bitbucket.org/odedevs/ode/src/bcfb66cd5e18e32e27cfaae3651ead930bbcda13/configure.ac#lines-428 +# https://bitbucket.org/odedevs/ode/issues/87/box-cylinder-ccd-check-disabled-by-default cmake ${CMAKE_ARGS} -DCMAKE_BUILD_TYPE=Release \ -DODE_WITH_LIBCCD:BOOL=ON \ -DODE_WITH_LIBCCD_SYSTEM:BOOL=ON \ + -DODE_WITH_LIBCCD_BOX_CYL:BOOL=OFF \ -DODE_WITH_DEMOS:BOOL=OFF \ -DODE_WITH_TESTS:BOOL=OFF .. \ -DCMAKE_INSTALL_PREFIX:PATH="" \ diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 4417513..7466c22 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -19,7 +19,7 @@ source: - fix_system_ccd_cmake.patch build: - number: 13 + number: 14 run_exports: # No ABI docs or ABI Laboratory history, better be conservative - {{ pin_subpackage(name, max_pin='x.x.x') }}