[med-svn] [Git][med-team/camp][master] Install cmake config files

[Flavien Bridault]

Flavien Bridault pushed to branch master at Debian Med / camp


Commits:
bc4ddbfa by Flavien Bridault at 2019-07-20T15:33:47Z
Install cmake config files


- - - - -


4 changed files:

- debian/changelog
- + debian/patches/fix_cmake_target.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+camp (0.8.2-2) UNRELEASED; urgency=medium
+
+  * d/rules: Install CMake files
+  * d/p/fix_cmake_target.patch: Use arch dependent library dir
+
+ -- Flavien Bridault <fbridault at ircad.fr>  Sat, 20 Jul 2019 10:23:10 +0000
+
 camp (0.8.2-1) unstable; urgency=medium
 
   [ Flavien Bridault ]


=====================================
debian/patches/fix_cmake_target.patch
=====================================
@@ -0,0 +1,26 @@
+Author: Flavien Bridault <fbridault at ircad.fr>
+Description: Use proper arch dependent library dir
+
+--- camp.orig/CMakeLists.txt
++++ camp/CMakeLists.txt
+@@ -198,6 +198,7 @@
+ 
+ # cmake
+ include(CMakePackageConfigHelpers)
++include(GNUInstallDirs)
+ 
+ configure_package_config_file(cmake/CAMPConfig.cmake.in
+     ${CMAKE_CURRENT_BINARY_DIR}/CAMPConfig.cmake
+@@ -226,9 +227,9 @@
+ 
+ install(TARGETS camp
+     EXPORT CAMPTargets
+-    RUNTIME DESTINATION bin COMPONENT bin
+-    LIBRARY DESTINATION lib COMPONENT bin
+-    ARCHIVE DESTINATION lib COMPONENT devel
++    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT bin
++    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT bin
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT devel
+ )
+ 
+ install(FILES ${CMAKE_BINARY_DIR}/camp.pc


=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
 remove_licences_files.patch
+fix_cmake_target.patch


=====================================
debian/rules
=====================================
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 %:
 	dh $@
@@ -14,5 +15,6 @@ override_dh_install:
 		--commit --multiarch --devunversioned --exclude-a --exclude-la \
 		--movedev debian/tmp/usr/include/camp usr/include \
 		--movedev debian/tmp/usr/include/camp-xml usr/include \
-		debian/tmp/usr/lib/*.so
+		--movedev debian/tmp/usr/lib/camp/cmake usr/lib/camp \
+		debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/*.so
 



View it on GitLab: https://salsa.debian.org/med-team/camp/commit/bc4ddbfa1e0d5847622ec4e903ea69f01fe24336

-- 
View it on GitLab: https://salsa.debian.org/med-team/camp/commit/bc4ddbfa1e0d5847622ec4e903ea69f01fe24336
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20190720/8e1744b9/attachment-0001.html>