[med-svn] [Git][med-team/charls][master] 2 commits: Extend CMakeLists.txt to create and install charlsConfigVersion.cmake

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / charls


Commits:
144381ab by Andreas Tille at 2021-12-21T07:58:46+01:00
Extend CMakeLists.txt to create and install charlsConfigVersion.cmake

- - - - -
38feed99 by Andreas Tille at 2021-12-21T08:00:06+01:00
routine-update: Ready to upload to unstable

- - - - -


4 changed files:

- debian/changelog
- debian/control
- + debian/patches/2e6e92dc3e88dc6e2553f84475cacff09f2eb8da.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+charls (2.2.0+dfsg-4) unstable; urgency=medium
+
+  * Extend CMakeLists.txt to create and install charlsConfigVersion.cmake
+    Closes: #995831
+
+ -- Andreas Tille <tille at debian.org>  Tue, 21 Dec 2021 07:59:22 +0100
+
 charls (2.2.0+dfsg-3) unstable; urgency=medium
 
   [ Steffen Moeller ]


=====================================
debian/control
=====================================
@@ -4,7 +4,7 @@ Uploaders: Andreas Tille <tille at debian.org>,
            Shayan Doust <hello at shayandoust.me>
 Section: science
 Priority: optional
-Build-Depends: cmake (>= 3.13),
+Build-Depends: cmake,
                debhelper-compat (= 13)
 Standards-Version: 4.6.0
 Vcs-Browser: https://salsa.debian.org/med-team/charls


=====================================
debian/patches/2e6e92dc3e88dc6e2553f84475cacff09f2eb8da.patch
=====================================
@@ -0,0 +1,38 @@
+From 2e6e92dc3e88dc6e2553f84475cacff09f2eb8da Mon Sep 17 00:00:00 2001
+From: Victor Derks <vbaderks at gmail.com>
+Date: Sun, 19 Dec 2021 18:06:06 +0100
+Subject: [PATCH] Extend CMakeLists.txt to create and install
+ charlsConfigVersion.cmake (#116)
+Bug-Debian: https://bugs.debian.org/995831
+Origin: https://github.com/team-charls/charls/issues/102
+
+---
+ src/CMakeLists.txt | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -100,6 +100,7 @@ endif()
+ 
+ if(CHARLS_INSTALL)
+   include(GNUInstallDirs)
++  include(CMakePackageConfigHelpers)
+ 
+   install(TARGETS charls EXPORT charls_targets
+     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+@@ -108,10 +109,14 @@ if(CHARLS_INSTALL)
+     PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/charls
+   )
+ 
++  write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/charlsConfigVersion.cmake COMPATIBILITY SameMajorVersion)
++
+   # Configure and copy the pkg-config configuration file.
+   # These type of configuration file can make it easier to detect if charls is installed.
+   CONFIGURE_FILE("${CMAKE_CURRENT_LIST_DIR}/charls-template.pc" "charls.pc" @ONLY)
+   install(FILES "${CMAKE_CURRENT_BINARY_DIR}/charls.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+ 
+-  install (EXPORT charls_targets FILE charlsConfig.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/charls)
++  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/charlsConfigVersion.cmake" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/charls")
++
++  install(EXPORT charls_targets FILE charlsConfig.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/charls)
+ endif()


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
 stl_symbols_hack.patch
 noexplicitstd.patch
+2e6e92dc3e88dc6e2553f84475cacff09f2eb8da.patch



View it on GitLab: https://salsa.debian.org/med-team/charls/-/compare/bbdbc81ee626fcb6a52410343f1b9dea319d2db9...38feed99e2426a8df53d3fe7f4ddece73173cc7e

-- 
View it on GitLab: https://salsa.debian.org/med-team/charls/-/compare/bbdbc81ee626fcb6a52410343f1b9dea319d2db9...38feed99e2426a8df53d3fe7f4ddece73173cc7e
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/20211221/71f0683f/attachment-0001.htm>