Commit bc4ddbfa authored by Flavien Bridault's avatar Flavien Bridault
Browse files

Install cmake config files

parent 8e311ae9

debian/changelog

+7 −0
Original line number Diff line number Diff line 
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@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 → 100644
+26 −0
Original line number Diff line number Diff line 
Author: Flavien Bridault <fbridault@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 −0
Original line number Diff line number Diff line 
remove_licences_files.patch

fix_cmake_target.patch

debian/rules

+3 −1
Original line number Diff line number Diff line 
#!/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