[med-svn] [gatb-core] 01/03: multiarch

[Andreas Tille]

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

tille pushed a commit to branch master
in repository gatb-core.

commit 141b71ea610a22993322ed722c227ad83cc00f04
Author: Andreas Tille <tille at debian.org>
Date:   Thu Dec 14 09:11:37 2017 +0100

    multiarch
---
 debian/patches/multiarch.patch | 26 ++++++++++++++++++++++++++
 debian/patches/series          |  1 +
 2 files changed, 27 insertions(+)

diff --git a/debian/patches/multiarch.patch b/debian/patches/multiarch.patch
new file mode 100644
index 0000000..d89e4a3
--- /dev/null
+++ b/debian/patches/multiarch.patch
@@ -0,0 +1,26 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Tue, 28 Nov 2017 10:37:22 +0100
+Description: Support Multiarch
+
+--- a/gatb-core/src/CMakeLists.txt
++++ b/gatb-core/src/CMakeLists.txt
+@@ -2,6 +2,8 @@
+ #  KMER SIZE DEFINITION 
+ ################################################################################
+ 
++include(GNUInstallDirs)
++
+ # We define the default values for kmer sizes.
+ if (NOT KSIZE_DEFAULT_LIST) # only if the tool cmake didn't override it
+     #list (APPEND KSIZE_DEFAULT_LIST  32   64)
+@@ -95,8 +97,8 @@ set_target_properties (gatbcore-dynamic
+ 
+ # We install the libraries
+ IF (NOT DEFINED GATB_CORE_INSTALL_EXCLUDE)
+-    install (TARGETS gatbcore-static DESTINATION lib)
+-    install (TARGETS gatbcore-dynamic DESTINATION lib)
++    install (TARGETS gatbcore-static DESTINATION "${CMAKE_INSTALL_LIBDIR}")
++    install (TARGETS gatbcore-dynamic DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+     install (DIRECTORY ${PROJECT_SOURCE_DIR}/src/ DESTINATION include FILES_MATCHING PATTERN "*.hpp" PATTERN "*.tpp" PATTERN "*.pri" PATTERN "*.h")
+     install (FILES ${PROJECT_BINARY_DIR}/include/gatb/system/api/config.hpp DESTINATION include/gatb/system/api/)
+ ENDIF ()
diff --git a/debian/patches/series b/debian/patches/series
index 4acdb26..63565fd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ dynamic_lib.patch
 fix_install_location.patch
 set_soversion.patch
 dynamic_linking_of_tools.patch
+multiarch.patch

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