Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support IN_LIST operator in DARTConfig.cmake (6.9 backport) #1494

Merged
merged 2 commits into from
Aug 30, 2020

Conversation

scpeters
Copy link
Collaborator

@scpeters scpeters commented Aug 30, 2020

In DART 6.9.3, the IN_LIST keyword in DARTFindBullet caused a configuration error in gazebo10 (see gazebosim/gazebo-classic#2835). Setting CMP0057 to new should prevent similar problems in downstream packages.


Before creating a pull request

  • Document new methods and classes
  • Format new code files using clang-format

Before merging a pull request

  • Set version target by selecting a milestone on the right side
  • Summarize this change in CHANGELOG.md
  • Add unit test(s) for this change

The IN_LIST keyword in DARTFindBullet caused a configuration
error in gazebo10. Setting CMP0057 to new should prevent
similar problems in downstream packages.
@scpeters scpeters requested a review from jslee02 August 30, 2020 08:14
Copy link
Member

@jslee02 jslee02 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, this was fixed in master (see #1434). Maybe we should apply the fix to 6.9 (probably 6.9.4) as well.

@@ -12,6 +12,7 @@
find_package(Bullet COMPONENTS BulletMath BulletCollision MODULE QUIET)

if((BULLET_FOUND OR Bullet_FOUND) AND NOT TARGET Bullet)
cmake_policy(SET CMP0057 NEW)
Copy link
Member

@jslee02 jslee02 Aug 30, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The error could occur anywhere IN_LIST is used. Also, this policy setting isn't necessary if the required CMake version is set from the parent project (e.g., gazebo). This policy setting isn't required if the required CMake version is set to 3.5.1 or greater. Let's fix this in DARTConfig.cmake.in like this one.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, I'll copy that approach here

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome, thanks!

@jslee02 jslee02 added this to the DART 6.9.4 milestone Aug 30, 2020
@codecov
Copy link

codecov bot commented Aug 30, 2020

Codecov Report

Merging #1494 into release-6.9 will increase coverage by 0.01%.
The diff coverage is n/a.

@@               Coverage Diff               @@
##           release-6.9    #1494      +/-   ##
===============================================
+ Coverage        57.02%   57.03%   +0.01%     
===============================================
  Files              366      366              
  Lines            27147    27147              
===============================================
+ Hits             15481    15484       +3     
+ Misses           11666    11663       -3     
Impacted Files Coverage Δ
dart/dynamics/Skeleton.cpp 66.14% <0.00%> (+0.16%) ⬆️

@scpeters scpeters changed the title DARTFindBullet: set CMP0057 to new Support IN_LIST operator in DARTConfig.cmake (6.9 backport) Aug 30, 2020
@jslee02 jslee02 merged commit 0ef9fd3 into dartsim:release-6.9 Aug 30, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants