Enable multiarch installation of binaries.

- New patch Add-support-for-multiarch.patch.
- Update install paths of lib and dev packages.
- Add Multi-Arch fields to all binary packages.

Gbp-Dch: full
parent 684d350e
......@@ -18,6 +18,7 @@ Homepage: http://ismrmrd.github.io/
Package: libismrmrd1.3
Architecture: any
Multi-Arch: same
Section: libs
Depends: ${misc:Depends},
${shlibs:Depends}
......@@ -35,6 +36,7 @@ Description: ISMRM Raw Data format (ISMRMRD)
Package: libismrmrd-dev
Architecture: any
Multi-Arch: same
Section: libdevel
Depends: ${misc:Depends},
ismrmrd-schema,
......@@ -54,6 +56,7 @@ Description: development files for ISMRMRD
Package: libismrmrd-doc
Architecture: all
Multi-Arch: foreign
Section: doc
Depends: ${misc:Depends},
libjs-jquery
......@@ -71,6 +74,7 @@ Description: documentation for ISMRMRD
Package: ismrmrd-tools
Architecture: any
Multi-Arch: foreign
Section: utils
Depends: ${misc:Depends},
${shlibs:Depends},
......@@ -89,6 +93,7 @@ Description: command-line tools for ISMRMRD
Package: ismrmrd-schema
Architecture: all
Multi-Arch: foreign
Section: misc
Depends: ${misc:Depends}
Description: schema for ISMRMRD
......
usr/include/ismrmrd
usr/lib/*.so
usr/lib/cmake
usr/lib/*/*.so
usr/lib/*/cmake
From: Ghislain Antony Vaillant <ghisvail@gmail.com>
Date: Fri, 11 Nov 2016 10:49:53 +0000
Subject: Add support for multiarch.
---
CMakeLists.txt | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e6b7589..b614f71 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -198,10 +198,12 @@ target_link_libraries(ismrmrd ${ISMRMRD_TARGET_LINK_LIBS})
list(APPEND ISMRMRD_LIBRARIES ismrmrd) # Add to list of libraries to be found
list(APPEND ISMRMRD_LIBRARY_DIRS ${CMAKE_BINARY_DIR} ) # Add to list of directories to find libaries
+include(GNUInstallDirs)
+
# install the main library
install(TARGETS ismrmrd EXPORT ISMRMRDTargets
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION bin
COMPONENT Devel
)
@@ -257,7 +259,7 @@ configure_file(cmake/ISMRMRDConfig.cmake.in
set(CONFIG_ISMRMRD_SCHEMA_DIR ${CMAKE_INSTALL_PREFIX}/share/ismrmrd/schema)
set(CONFIG_ISMRMRD_TARGET_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/include)
-set(CONFIG_ISMRMRD_LIBRARY_DIRS ${CMAKE_INSTALL_PREFIX}/lib)
+set(CONFIG_ISMRMRD_LIBRARY_DIRS ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
if (ISMRMRD_DATASET_SUPPORT)
list(APPEND CONFIG_ISMRMRD_TARGET_INCLUDE_DIRS ${HDF5_INCLUDE_DIRS})
list(APPEND CONFIG_ISMRMRD_LIBRARY_DIRS ${HDF5_LIBRARY_DIRS})
@@ -268,7 +270,7 @@ configure_file(cmake/ISMRMRDConfig.cmake.in
@ONLY
)
-set(ConfigPackageLocation lib/cmake/ISMRMRD)
+set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/ISMRMRD)
install(
FILES
"${CMAKE_CURRENT_BINARY_DIR}/InstallFiles/ISMRMRDConfig.cmake"
......@@ -3,3 +3,4 @@ Use-explicit-64-bit-shifts-in-testsuite.patch
Fix-HDF5-detection-with-CMake-3.6.patch
Fix-CMake-package-configuration.patch
Fix-CMake-package-detection.patch
Add-support-for-multiarch.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment