diff options
author | Jerry Lin | 2018-11-05 05:26:44 +0800 |
---|---|---|
committer | Jerry Lin | 2018-11-05 05:26:44 +0800 |
commit | a79b1c04f5a9fb366091c2a1c593890c9f548330 (patch) | |
tree | 6a612947d4385b4ddd0ef4a6f9e0b2ab74e6d61d /find-ogre.patch | |
parent | 2d2290af49e9e7674bef98019f8645c5c687f8d1 (diff) | |
download | aur-ros-indigo-rviz-plugin-tutorials.tar.gz |
Fix ogre-1.9 dependency and library path. Bump the pkgrel.
Diffstat (limited to 'find-ogre.patch')
-rw-r--r-- | find-ogre.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/find-ogre.patch b/find-ogre.patch new file mode 100644 index 000000000000..594dd27b01ca --- /dev/null +++ b/find-ogre.patch @@ -0,0 +1,29 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 099caba..1f125e6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -4,9 +4,14 @@ + ## First start with some standard catkin stuff. + cmake_minimum_required(VERSION 2.8.3) + project(rviz_plugin_tutorials) ++ ++# Ogre ++find_package(PkgConfig REQUIRED) ++pkg_check_modules(OGRE OGRE) ++ + find_package(catkin REQUIRED COMPONENTS rviz) + catkin_package() +-include_directories(${catkin_INCLUDE_DIRS}) ++include_directories(${catkin_INCLUDE_DIRS} ${OGRE_INCLUDE_DIRS}) + link_directories(${catkin_LIBRARY_DIRS}) + + ## This plugin includes Qt widgets, so we must include Qt like so: +@@ -53,7 +58,7 @@ add_library(${PROJECT_NAME} ${SOURCE_FILES}) + ## library and names the actual file something like + ## "librviz_plugin_tutorials.so", or whatever is appropriate for your + ## particular OS. +-target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES} ${catkin_LIBRARIES}) ++target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES} ${catkin_LIBRARIES} ${OGRE_LIBRARIES}) + ## END_TUTORIAL + + |