Skip to content

Commit

Permalink
Merge pull request #23 from traversaro/autotoolsalign
Browse files Browse the repository at this point in the history
Set ODE_WITH_LIBCCD_BOX_CYL to OFF for consistency with autotools builds used in Linux distributions
  • Loading branch information
traversaro committed Mar 19, 2024
2 parents 387abf1 + 5ff7ca4 commit 34e4e1d
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 1 deletion.
6 changes: 6 additions & 0 deletions recipe/bld.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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 ^
Expand Down
6 changes: 6 additions & 0 deletions recipe/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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="" \
Expand Down
2 changes: 1 addition & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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') }}
Expand Down

0 comments on commit 34e4e1d

Please sign in to comment.