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

Fixed "pragma-patch.diff" on MacOS Ventura 13.1 / Xcode 14.2 (#925) #938

Open
wants to merge 1 commit into
base: humble
Choose a base branch
from
Open

Fixed "pragma-patch.diff" on MacOS Ventura 13.1 / Xcode 14.2 (#925) #938

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion rviz_ogre_vendor/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ macro(build_ogre)
${extra_cmake_args}
-Wno-dev
PATCH_COMMAND
${Patch_EXECUTABLE} -p1 -N < ${CMAKE_CURRENT_SOURCE_DIR}/pragma-patch.diff &&
${Patch_EXECUTABLE} -p1 -N -l < ${CMAKE_CURRENT_SOURCE_DIR}/pragma-patch.diff &&
${Patch_EXECUTABLE} -p1 -N < ${CMAKE_CURRENT_SOURCE_DIR}/fix-arm64.diff
COMMAND
${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/FindFreetype.cmake ${CMAKE_CURRENT_BINARY_DIR}/ogre-v1.12.1-prefix/src/ogre-v1.12.1/CMake/Packages/FindFreetype.cmake
Expand Down
4 changes: 2 additions & 2 deletions rviz_ogre_vendor/pragma-patch.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1814,14 +1814,14 @@ diff --git a/PlugIns/OctreeZone/CMakeLists.txt b/PlugIns/OctreeZone/CMakeLists.t
@@ -23,6 +23,11 @@ generate_export_header(Plugin_OctreeZone
EXPORT_MACRO_NAME _OgreOctreeZonePluginExport
EXPORT_FILE_NAME ${PROJECT_BINARY_DIR}/include/OgreOctreeZonePrerequisites.h)

+if (UNIX)
+ set_property(TARGET Plugin_OctreeZone APPEND PROPERTY
+ INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${OGRE_LIB_DIRECTORY}/OGRE)
+endif ()
+
ogre_config_framework(Plugin_OctreeZone)

ogre_config_plugin(Plugin_OctreeZone)
diff --git a/OgreMain/include/OgreTimer.h b/OgreMain/include/OgreTimer.h
--- a/OgreMain/include/OgreTimer.h 2019-06-24 16:04:20.000000000 -0700
Expand Down