[med-svn] [fw4spl] 01/01: added multi-arch support.

[Flavien Bridault]

This is an automated email from the git hooks/post-receive script.

fbridault-guest pushed a commit to branch master
in repository fw4spl.

commit 31a167a687467eb32b7438ae30af6466eb6d209c
Author: Flavien Bridault <fbridault at ircad.fr>
Date:   Tue Nov 29 08:35:55 2016 +0100

    added multi-arch support.
---
 debian/control                   |  1 +
 debian/patches/fix_install.patch | 37 +++++++++++++++++++++++++++----------
 debian/rules                     |  6 ++++--
 3 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/debian/control b/debian/control
index 6b89ec9..b77062b 100644
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,7 @@ Uploaders: Flavien Bridault <fbridault at ircad.fr>
 Section: science
 Priority: optional
 Build-Depends: debhelper (>= 10),
+               d-shlibs,
                cmake (>= 2.8.11),
                libboost-all-dev,
                zlib1g-dev,
diff --git a/debian/patches/fix_install.patch b/debian/patches/fix_install.patch
index 280436b..88be7d1 100644
--- a/debian/patches/fix_install.patch
+++ b/debian/patches/fix_install.patch
@@ -18,7 +18,7 @@
 -bundledir=`cd "$bindir/@BUNDLE_PREFIX@"; pwd`
 -fontdir=`cd "$libdir/fonts"; pwd`
 +bindir="$me/bin"
-+libdir=`cd "$me/lib" ; pwd`
++libdir=`cd "$me/@CMAKE_INSTALL_LIBDIR@" ; pwd`
 +bundledir=`cd "$me/@BUNDLE_PREFIX@"; pwd`
  
  #export LD_LIBRARY_PATH
@@ -95,7 +95,15 @@
          NO_MODULE)
 --- fw4spl.orig/CMakeLists.txt
 +++ fw4spl/CMakeLists.txt
-@@ -70,6 +70,7 @@
+@@ -7,6 +7,7 @@
+ 
+ include(CheckVariableExists)
+ include(CMakeParseArguments)
++include(GNUInstallDirs)
+ include(${CMAKE_CURRENT_SOURCE_DIR}/CMake/build/profile_config.cmake)
+ include(${CMAKE_CURRENT_SOURCE_DIR}/CMake/build/plugin_config.cmake)
+ include(${CMAKE_CURRENT_SOURCE_DIR}/CMake/install/generic_install.cmake)
+@@ -70,6 +71,7 @@
  endif()
  
  set(BUNDLE_PREFIX "Bundles")
@@ -103,19 +111,19 @@
  
  # Set warning level and function export visibility on Unix
  if(UNIX)
-@@ -84,8 +85,9 @@
+@@ -84,8 +86,9 @@
  
          #To make a debian package we should install our bundle in /usr/share/...
          if(DEBIAN_INSTALL)
 -            set(BUNDLE_PREFIX "share/Bundles")
 -        endif()
-+            set(BUNDLE_PREFIX "lib/fw4spl")
-+	    set(RC_PREFIX "lib/fw4spl")
++            set(BUNDLE_PREFIX "${CMAKE_INSTALL_LIBDIR}/fw4spl")
++	    set(RC_PREFIX "${CMAKE_INSTALL_LIBDIR}/fw4spl")
 +         endif()
  
      endif()
      # Color for ninja and Clang on Linux and OSX
-@@ -145,6 +147,7 @@
+@@ -145,6 +148,7 @@
  endif()
  
  add_definitions(-DBUNDLE_PREFIX="${BUNDLE_PREFIX}")
@@ -123,7 +131,7 @@
  
  macro(groupMaker FWPROJECT_NAME)
      file(GLOB_RECURSE PRJ_SOURCES "${${FWPROJECT_NAME}_DIR}/*")
-@@ -336,7 +339,7 @@
+@@ -336,7 +340,7 @@
          add_dependencies( ${FWPROJECT_NAME} ${FWPROJECT_NAME}_rc )
  
          if(${FWPROJECT_NAME}_INSTALL)
@@ -132,7 +140,7 @@
          endif()
      endif()
  
-@@ -390,7 +393,7 @@
+@@ -390,7 +394,7 @@
          add_dependencies( ${FWPROJECT_NAME} ${FWPROJECT_NAME}_rc )
  
          if(${FWPROJECT_NAME}_INSTALL)
@@ -141,7 +149,7 @@
          endif()
      endif()
  
-@@ -448,7 +451,7 @@
+@@ -448,7 +452,7 @@
          add_dependencies( ${FWPROJECT_NAME} ${FWPROJECT_NAME}_rc )
  
          if(${FWPROJECT_NAME}_INSTALL)
@@ -150,7 +158,16 @@
          endif()
  
      endif()
-@@ -564,7 +567,7 @@
+@@ -457,7 +461,7 @@
+         install(
+             TARGETS ${FWPROJECT_NAME}
+             RUNTIME DESTINATION bin
+-            LIBRARY DESTINATION ${LIBRARY_OUTPUT_DIR}
++            LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+             OPTIONAL NAMELINK_SKIP
+             )
+     endif()
+@@ -564,7 +568,7 @@
      endif()
  
      if(${FWPROJECT_NAME}_INSTALL)
diff --git a/debian/rules b/debian/rules
index 8b4d982..03b012a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,8 @@
 
 #fix the lintian "hardening" message 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 
@@ -14,7 +16,7 @@ LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 	dh $@
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE -DDEBIAN_INSTALL=ON -DUSE_SYSTEM_LIB=ON -DPROJECTS_TO_BUILD="VRRender" -DPROJECTS_TO_INSTALL="VRRender" -DCMAKE_INSTALL_RPATH="/usr/lib/fw4spl" -Wno-dev
+	dh_auto_configure -- -DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE -DDEBIAN_INSTALL=ON -DUSE_SYSTEM_LIB=ON -DPROJECTS_TO_BUILD="VRRender" -DPROJECTS_TO_INSTALL="VRRender" -DCMAKE_INSTALL_RPATH="/usr/lib/$(DEB_HOST_MULTIARCH)/fw4spl" -Wno-dev
 
 override_dh_auto_install:
 	dh_auto_install --destdir=debian/fw4spl
@@ -25,5 +27,5 @@ override_dh_auto_test:
 	echo "test disabled"
 
 override_dh_shlibdeps:
-	dh_shlibdeps -v -l/usr/lib:/usr/lib/fw4spl:/usr/lib/fw4spl/Bundles:/usr/lib/fw4spl/gui_0-1/:/usr/lib/fw4spl/io_0-1/:/usr/lib/fw4spl:/usr/lib/fw4spl/ctrlSelection_0-1/:/usr/lib/fw4spl/ioITK_0-1/
+	dh_shlibdeps -v -l/usr/lib/$(DEB_HOST_MULTIARCH):/usr/lib/$(DEB_HOST_MULTIARCH)/fw4spl:/usr/lib/$(DEB_HOST_MULTIARCH)/fw4spl/Bundles:/usr/lib/$(DEB_HOST_MULTIARCH)/fw4spl/gui_0-1/:/usr/lib/$(DEB_HOST_MULTIARCH)/fw4spl/io_0-1/:/usr/lib/$(DEB_HOST_MULTIARCH)/fw4spl:/usr/lib/$(DEB_HOST_MULTIARCH)/fw4spl/ctrlSelection_0-1/:/usr/lib/$(DEB_HOST_MULTIARCH)/fw4spl/ioITK_0-1/
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/fw4spl.git