Avoid check macro collision. #1165
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
wjwwood
reviewed
Oct 20, 2017
CMakeLists.txt
Outdated
| @@ -89,6 +89,7 @@ endif(NOT DEFINED OGRE_OV_LIBRARIES_ABS) | |||
| if(APPLE) | |||
| FIND_LIBRARY(Cocoa_LIBRARIES Cocoa) | |||
| set(rviz_ADDITIONAL_LIBRARIES ${Cocoa_LIBRARIES}) | |||
| add_definitions(-D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=0) | |||
There was a problem hiding this comment.
Can you add a comment here describing why this is needed? If I read this a few years from now, I might just remove it because I have not idea what's its purpose is (well I wouldn't but someone might).
|
Commented as suggested. |
wjwwood
approved these changes
Oct 20, 2017
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.
Fixes the issue described here: mikepurvis/ros-install-osx#84 (comment)