Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
robotpkg-wip
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Gepetto
robotpkg-wip
Commits
5b9f825d
Commit
5b9f825d
authored
4 years ago
by
Guilhem Saurel
Browse files
Options
Downloads
Patches
Plain Diff
[wip/py-prf-gazebo-ros-pkgs] fix build for opencv
parent
fc495560
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
py-prf-gazebo-ros-pkgs/Makefile
+3
-0
3 additions, 0 deletions
py-prf-gazebo-ros-pkgs/Makefile
py-prf-gazebo-ros-pkgs/distinfo
+1
-0
1 addition, 0 deletions
py-prf-gazebo-ros-pkgs/distinfo
py-prf-gazebo-ros-pkgs/patches/patch-ab
+18
-0
18 additions, 0 deletions
py-prf-gazebo-ros-pkgs/patches/patch-ab
with
22 additions
and
0 deletions
py-prf-gazebo-ros-pkgs/Makefile
+
3
−
0
View file @
5b9f825d
...
...
@@ -5,6 +5,7 @@
ORG
=
pal-robotics-forks
NAME
=
gazebo-ros-pkgs
VERSION
=
3.0.1
PKGREVISION
=
1
PRFNAME
=
prf-
${
NAME
}
ROSNAME
=
$(
subst -,_,
${
NAME
})
...
...
@@ -45,6 +46,7 @@ ifneq (,$(filter 16.04%,${OS_VERSION}))
endif
include
../../wip/py-prf-ros-control/depend.mk
DEPEND_ABI.opencv
+=
opencv<4
include
../../devel/ros-cmake-modules/depend.mk
include
../../devel/boost-headers/depend.mk
...
...
@@ -55,6 +57,7 @@ include ../../middleware/ros-comm/depend.mk
include
../../devel/ros-pluginlib/depend.mk
include
../../devel/ros-ros/depend.mk
include
../../graphics/ros-urdf/depend.mk
include
../../image/opencv/depend.mk
include
../../image/ros-image-common/depend.mk
include
../../image/ros-vision-opencv/depend.mk
include
../../interfaces/ros-common-msgs/depend.mk
...
...
This diff is collapsed.
Click to expand it.
py-prf-gazebo-ros-pkgs/distinfo
+
1
−
0
View file @
5b9f825d
...
...
@@ -2,3 +2,4 @@ SHA1 (prf-gazebo-ros-pkgs/3.0.1.tar.gz) = abc1d1188a8f85cccd3f7aae02ad5025f961a5
RMD160 (prf-gazebo-ros-pkgs/3.0.1.tar.gz) = c455e72a1385144d02293285d6310051f81ca393
Size (prf-gazebo-ros-pkgs/3.0.1.tar.gz) = 1858951 bytes
SHA1 (patch-aa) = 47fb92ee7215c46780ebb50d863cb02a7d19c968
SHA1 (patch-ab) = aac18e91fd63fa13c6cb3546381be1e02efb2145
This diff is collapsed.
Click to expand it.
py-prf-gazebo-ros-pkgs/patches/patch-ab
0 → 100644
+
18
−
0
View file @
5b9f825d
--- gazebo_plugins/CMakeLists.txt.orig 2019-11-05 16:53:46.000000000 +0100
+++ gazebo_plugins/CMakeLists.txt 2020-12-08 03:11:29.661699947 +0100
@@ -36,6 +36,7 @@
pkg_check_modules(OGRE OGRE)
pkg_check_modules(OGRE-Terrain OGRE-Terrain)
pkg_check_modules(OGRE-Paging OGRE-Paging)
+ pkg_check_modules(opencv3 opencv3)
else()
message(FATAL_ERROR "pkg-config is required; please install it")
endif()
@@ -64,6 +65,7 @@
${OGRE_INCLUDE_DIRS}
${OGRE-Terrain_INCLUDE_DIRS}
${OGRE-Paging_INCLUDE_DIRS}
+ ${opencv3_INCLUDE_DIRS}
)
link_directories(
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment