forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
dev-ros/image_rotate: Backport upstream patch to build with gcc6.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
- Loading branch information
Showing
2 changed files
with
36 additions
and
1 deletion.
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
commit 6c2d65452bd5fe62723988a1a570789921900d59 | ||
Author: Lukas Bulwahn <[email protected]> | ||
Date: Fri Sep 30 15:39:47 2016 +0200 | ||
|
||
address gcc6 build error | ||
|
||
With gcc6, compiling fails with `stdlib.h: No such file or directory`, | ||
as including '-isystem /usr/include' breaks with gcc6, cf., | ||
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70129. | ||
|
||
This commit addresses this issue for this package in the same way | ||
it was addressed in various other ROS packages. A list of related | ||
commits and pull requests is at: | ||
|
||
https://github.com/ros/rosdistro/issues/12783 | ||
|
||
Signed-off-by: Lukas Bulwahn <[email protected]> | ||
|
||
diff --git a/image_rotate/CMakeLists.txt b/image_rotate/CMakeLists.txt | ||
index 04ba03b..75d8e77 100644 | ||
--- a/image_rotate/CMakeLists.txt | ||
+++ b/image_rotate/CMakeLists.txt | ||
@@ -12,10 +12,7 @@ find_package(OpenCV REQUIRED core imgproc) | ||
find_package(Eigen REQUIRED) | ||
|
||
# add the executable | ||
-include_directories(SYSTEM ${catkin_INCLUDE_DIRS} | ||
- ${EIGEN_INCLUDE_DIRS} | ||
- ${OpenCV_INCLUDE_DIRS} | ||
-) | ||
+include_directories(${catkin_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} ${OpenCV_INCLUDE_DIRS}) | ||
|
||
add_library(${PROJECT_NAME} SHARED src/nodelet/image_rotate_nodelet.cpp) | ||
target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES} ${OpenCV_LIBRARIES}) |
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