[bfl] 29/40: Add patch to install library into multiarch path
Johannes Schauer
josch at moszumanska.debian.org
Fri Aug 11 17:24:06 UTC 2017
This is an automated email from the git hooks/post-receive script.
josch pushed a commit to branch master
in repository bfl.
commit 481bef8b5bcb82e5e05573aa92d97bee26c45bc6
Author: Johannes 'josch' Schauer <josch at mister-muffin.de>
Date: Sat Aug 12 00:56:29 2017 +0900
Add patch to install library into multiarch path
---
debian/patches/install-library-multiarch-path | 17 +++++++++++++++++
debian/patches/series | 1 +
2 files changed, 18 insertions(+)
diff --git a/debian/patches/install-library-multiarch-path b/debian/patches/install-library-multiarch-path
new file mode 100644
index 0000000..ade9e62
--- /dev/null
+++ b/debian/patches/install-library-multiarch-path
@@ -0,0 +1,17 @@
+Description: Install library into multiarch path
+
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -16,10 +16,10 @@ ENDIF( OROCOS_PLUGIN )
+
+ # examples will be linked with orocos-bfl, so when building both static and shared, examples will link with shared
+ IF (LIBRARY_TYPE STREQUAL "shared")
++ include(GNUInstallDirs)
+ ADD_LIBRARY(orocos-bfl SHARED $ENV{GLOBAL_LIBRARY_SRCS})
+- SET_TARGET_PROPERTIES(orocos-bfl PROPERTIES OUTPUT_NAME orocos-bfl)
+ SET_TARGET_PROPERTIES(orocos-bfl PROPERTIES VERSION "${VERSION}" SOVERSION "${VERSION_MAJOR}.${VERSION_MINOR}")
+- INSTALL_TARGETS( /lib orocos-bfl)
++ INSTALL(TARGETS orocos-bfl LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT library)
+ ELSE (LIBRARY_TYPE STREQUAL "shared")
+
+ IF (LIBRARY_TYPE STREQUAL "static")
diff --git a/debian/patches/series b/debian/patches/series
index 87cdb47..4fd7f26 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
add-soversion
+install-library-multiarch-path
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/orocos/bfl.git
More information about the debian-science-commits
mailing list