Fix BULLET_INCLUDE_DIRS in DARTCoreConfig.cmake #361
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
You're right. +1 By the way, don't we need quotes? I'm not sure when quotes are required. |
|
It works without quotes on my machine. Maybe quotes are needed if there are spaces in the path? I can put them in. I took them out because it left a |
jslee02
added a commit
that referenced
this pull request
Mar 21, 2015
Fix BULLET_INCLUDE_DIRS in DARTCoreConfig.cmake
jslee02
added a commit
that referenced
this pull request
Apr 24, 2016
The fix from #361 doesn't work if bullet package was found by `find_package`. If bullet is not found, `BULLET_INCLUDE_DIRS` will be set to `BULLET_INCLUDE_DIRS-NOT-FOUND` rather than blank as we assumed in #361. Instead, we set DART_INCLUDE_DIRS in the top CMakeList.txt depending on the condition of that bullet has found, and then use it in DART[Core]Config.cmake.in.
jslee02
added a commit
that referenced
this pull request
Apr 24, 2016
The fix from #361 doesn't work if bullet packages was failed to be found by `find_package()`. When bullet is not found, `BULLET_INCLUDE_DIRS` will be set to `BULLET_INCLUDE_DIRS-NOT-FOUND` rather than blank as we assumed in #361. Instead, we set `DART_INCLUDE_DIRS` in the top level CMakeList.txt by adding `BULLET_INCLUDE_DIRS` to `DART_INCLUDE_DIRS` only when bullet is found. `DARTConfig.cmake` is then configured using `DART_INCLUDE_DIRS`.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The fix from #352 doesn't work if the downstream code
doesn't have the HAVE_BULLET_COLLISION variable defined.
This change just inserts the BULLET_INCLUDE_DIRS
variable into DARTCore_INCLUDE_DIRS
and trusts that it will be blank and not affect
anything if it is unset.
Closes #351.