From 02a74b0bfd8a3442b259ba4b471b17240c1fd523 Mon Sep 17 00:00:00 2001
From: Rohan Budhiraja <budhiraja@laas.fr>
Date: Thu, 30 Jun 2016 14:36:57 +0200
Subject: [PATCH] [wip/sot-hrp2-v3][patch] hard code cmake library install
directory to lib (Fedora 21 x86_64)
---
sot-hrp2-v3/Makefile | 2 +-
sot-hrp2-v3/PLIST | 1 +
sot-hrp2-v3/distinfo | 1 +
sot-hrp2-v3/patches/patch-aa | 12 ++++++++++++
4 files changed, 15 insertions(+), 1 deletion(-)
create mode 100644 sot-hrp2-v3/patches/patch-aa
diff --git a/sot-hrp2-v3/Makefile b/sot-hrp2-v3/Makefile
index 49c379ad..485b4d49 100644
--- a/sot-hrp2-v3/Makefile
+++ b/sot-hrp2-v3/Makefile
@@ -15,7 +15,7 @@ COMMENT= This packages provides a generic Stack Of Tasks library for the humano
LICENSE= gnu-lgpl-v3
MAINTAINER= hpp@laas.fr
-DYNAMIC_PLIST_DIRS+= share/doc/sot-hrp2-v3
+DYNAMIC_PLIST_DIRS+= share/doc/sot-hrp2
include ../../wip/dynamic-graph-bridge-v3/depend.mk
diff --git a/sot-hrp2-v3/PLIST b/sot-hrp2-v3/PLIST
index 8dc6c072..411bb31c 100644
--- a/sot-hrp2-v3/PLIST
+++ b/sot-hrp2-v3/PLIST
@@ -2,6 +2,7 @@ include/sot-hrp2/config.h
include/sot-hrp2/config.hh
include/sot-hrp2/deprecated.hh
include/sot-hrp2/warning.hh
+lib/libsot-hrp2-10-controller.so
lib/libsot-hrp2-14-controller.so
lib/libsot-hrp2-device.so
lib/pkgconfig/sot-hrp2.pc
diff --git a/sot-hrp2-v3/distinfo b/sot-hrp2-v3/distinfo
index 29db15fd..428430e1 100644
--- a/sot-hrp2-v3/distinfo
+++ b/sot-hrp2-v3/distinfo
@@ -1,3 +1,4 @@
SHA1 (sot-hrp2-v3-2.0.0.tar.gz) = c8e2385252c3b4959ee4f1be721544b66a492468
RMD160 (sot-hrp2-v3-2.0.0.tar.gz) = 5ba7b88903cb5c92e96445ccce9b30253bedafe1
Size (sot-hrp2-v3-2.0.0.tar.gz) = 733017 bytes
+SHA1 (patch-aa) = b1bd612b7d437c3f45e12942f401418f74e449ae
diff --git a/sot-hrp2-v3/patches/patch-aa b/sot-hrp2-v3/patches/patch-aa
new file mode 100644
index 00000000..a3ee58fd
--- /dev/null
+++ b/sot-hrp2-v3/patches/patch-aa
@@ -0,0 +1,12 @@
+diff --git CMakeLists.txt CMakeLists.txt
+index 48545b5..abed4da 100644
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -61,6 +61,7 @@ SEARCH_FOR_EIGEN()
+
+ # Handle rpath necessary to handle ROS multiplace packages
+ # libraries inclusion
++SET(CMAKE_INSTALL_LIBDIR lib)
+ SET(CMAKE_SKIP_BUILD_RPATH FALSE)
+ SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+ SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
--
GitLab