Skip to content
Snippets Groups Projects
Commit fc2a4ed7 authored by Olivier Stasse's avatar Olivier Stasse
Browse files

[wip/prf-gazebo-ros-pkgs] Uses PREFIX instead of ROBOTPKG_BASE.

parent 46af5620
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
prf-gazebo-ros-pkgs/Makefile
+ 3
− 3
View file @ fc2a4ed7
...@@ -9,7 +9,7 @@ DISTNAME= ${VERSION} ...@@ -9,7 +9,7 @@ DISTNAME= ${VERSION}
ROSNAME= $(subst -,_,${PRFNAME}) ROSNAME= $(subst -,_,${PRFNAME})
WRKSRC= ${WRKDIR}/${ROSNAME}-${VERSION} WRKSRC= ${WRKDIR}/${ROSNAME}-${VERSION}
DIST_SUBDIR= ${PKGBASE} DIST_SUBDIR= ${PKGBASE}
PKGREVISION= 3 PKGREVISION= 4
CATEGORIES= wip CATEGORIES= wip
HOMEPAGE= ${MASTER_SITE_GITHUB:=pal-robotics-forks/${ROSNAME}} HOMEPAGE= ${MASTER_SITE_GITHUB:=pal-robotics-forks/${ROSNAME}}
...@@ -18,14 +18,14 @@ MASTER_SITES= ${HOMEPAGE}/archive/ ...@@ -18,14 +18,14 @@ MASTER_SITES= ${HOMEPAGE}/archive/
COMMENT= Wrappers, tools and additional API for using ROS with Gazebo. COMMENT= Wrappers, tools and additional API for using ROS with Gazebo.
LICENSE= 2-clause-bsd LICENSE= 2-clause-bsd
CONFLICTS+= gazebo-ros-control CONFLICTS+= gazebo-ros-control-[0-9]*
ROS_METAPKG= yes ROS_METAPKG= yes
CMAKE_ARGS+=\ CMAKE_ARGS+=\
-Dgazebo_INCLUDE_DIRS=$(filter include/%,${SYSTEM_SEARCH.gazebo}) \ -Dgazebo_INCLUDE_DIRS=$(filter include/%,${SYSTEM_SEARCH.gazebo}) \
-Dgazebo_LIBRARIES=$(filter %.so,${SYSTEM_SEARCH.gazebo}) -Dgazebo_LIBRARIES=$(filter %.so,${SYSTEM_SEARCH.gazebo})
CMAKE_PREFIX_PATH+= ${ROBOTPKG_BASE} CMAKE_PREFIX_PATH+= ${PREFIX}
include ../../devel/boost-headers/depend.mk include ../../devel/boost-headers/depend.mk
include ../../devel/boost-libs/depend.mk include ../../devel/boost-libs/depend.mk
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment