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.

Sign up for GitHub

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

Avoid check macro collision. #1165

Merged
merged 2 commits into from
Oct 20, 2017
Merged

Avoid check macro collision. #1165

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21eac2b
Avoid check macro collision.
mikepurvis Oct 20, 2017
61b7b8d
Add comment as suggested.
mikepurvis Oct 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,11 @@ endif(NOT DEFINED OGRE_OV_LIBRARIES_ABS)
if(APPLE)
FIND_LIBRARY(Cocoa_LIBRARIES Cocoa)
set(rviz_ADDITIONAL_LIBRARIES ${Cocoa_LIBRARIES})

# This definition prevents an Apple header from defining a macro called "check", which if
# present, collides with another function in the rviz code. See:
# https://opensource.apple.com/source/CarbonHeaders/CarbonHeaders-18.1/AssertMacros.h
add_definitions(-D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=0)
endif()

find_package(OpenGL REQUIRED)
Expand Down