From 19c6185e9e2a6ddbb1f7f26446aecdbf92f10d66 Mon Sep 17 00:00:00 2001 From: Rohan Budhiraja <budhiraja@laas.fr> Date: Thu, 30 Jun 2016 10:42:43 +0200 Subject: [PATCH] [wip/sot-romeo-v3][patch] use pkg_config instead of rospack for ros dependency check --- sot-romeo-v3/Makefile | 1 + sot-romeo-v3/distinfo | 1 + sot-romeo-v3/patches/patch-ab | 13 +++++++++++++ 3 files changed, 15 insertions(+) create mode 100644 sot-romeo-v3/patches/patch-ab diff --git a/sot-romeo-v3/Makefile b/sot-romeo-v3/Makefile index f3504092..d36ca3ba 100644 --- a/sot-romeo-v3/Makefile +++ b/sot-romeo-v3/Makefile @@ -6,6 +6,7 @@ VERSION= 2.0.0 DISTNAME= sot-romeo-v3-${VERSION} PKGNAME= sot-romeo-v3-${VERSION} +REVISION= 1 CATEGORIES= wip MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=sot-romeo-v3/} diff --git a/sot-romeo-v3/distinfo b/sot-romeo-v3/distinfo index 1a50f7b2..758c7308 100644 --- a/sot-romeo-v3/distinfo +++ b/sot-romeo-v3/distinfo @@ -2,3 +2,4 @@ SHA1 (sot-romeo-v3-2.0.0.tar.gz) = dbf6eb4885962467c11bf1b14e2343797d3487b2 RMD160 (sot-romeo-v3-2.0.0.tar.gz) = aaa2db1de593d3da0a41bb63647c8347cb06855e Size (sot-romeo-v3-2.0.0.tar.gz) = 105021 bytes SHA1 (patch-aa) = 0319ccbe6c1622c7708972f6fa4fde3e9361002c +SHA1 (patch-ab) = f9980b73a906658126092a370fe79eb41f08dbb4 diff --git a/sot-romeo-v3/patches/patch-ab b/sot-romeo-v3/patches/patch-ab new file mode 100644 index 00000000..87849cb1 --- /dev/null +++ b/sot-romeo-v3/patches/patch-ab @@ -0,0 +1,13 @@ +diff --git src/CMakeLists.txt src/CMakeLists.txt +index 91cd64f..db40b6f 100644 +--- src/CMakeLists.txt ++++ src/CMakeLists.txt +@@ -71,7 +71,7 @@ PKG_CONFIG_USE_DEPENDENCY(${CONTROLLER_NAME} "dynamic-graph") + PKG_CONFIG_USE_DEPENDENCY(${CONTROLLER_NAME} "dynamic-graph-python") + PKG_CONFIG_USE_DEPENDENCY(${CONTROLLER_NAME} "sot-core") + +-ROSPACK_USE_DEPENDENCY(${CONTROLLER_NAME} "dynamic_graph_bridge") ++PKG_CONFIG_USE_DEPENDENCY(${CONTROLLER_NAME} "dynamic_graph_bridge") + + + IF(UNIX AND NOT APPLE) -- GitLab