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

Jump to bottom

Upgrade to OGRE 1.10.12 to get OSX fix for Sierra #380

Merged
merged 1 commit into from
May 10, 2019
Merged

Upgrade to OGRE 1.10.12 to get OSX fix for Sierra #380

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions rviz_ogre_vendor/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,8 @@ macro(build_ogre)

include(ExternalProject)
ExternalProject_Add(ogre-master-ca665a6
URL https://github.com/OGRECave/ogre/archive/v1.10.11.zip
URL_MD5 6ffd5048fae72805e287bfc0b462b2ea
URL https://github.com/OGRECave/ogre/archive/v1.10.12.zip
URL_MD5 c8d2626270d576a98cc40ea194fdb39e
TIMEOUT 1200
LOG_CONFIGURE ${should_log}
LOG_BUILD ${should_log}
Expand All @@ -171,7 +171,7 @@ macro(build_ogre)
-DOGRE_INSTALL_SAMPLES:BOOL=FALSE
-DOGRE_INSTALL_SAMPLES_SOURCE:BOOL=FALSE
-DOGRE_CONFIG_THREADS:STRING=0
-DOGRE_RESOURCEMANAGER_STRICT:BOOL=ON
-DOGRE_RESOURCEMANAGER_STRICT:STRING=2
-DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/ogre_install
-DOGRE_BUILD_LIBS_AS_FRAMEWORKS:BOOL=OFF
${extra_cmake_args}
Expand Down