[med-svn] [Git][med-team/argh][master] 2 commits: Install cmake files in /usr/share

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / argh


Commits:
3e99ab6f by Andreas Tille at 2020-09-23T21:04:53+02:00
Install cmake files in /usr/share

- - - - -
3e5c1452 by Andreas Tille at 2020-09-23T21:08:36+02:00
Upload to new

- - - - -


2 changed files:

- debian/changelog
- debian/patches/no_install_cmake_files.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-argh (1.3.1+ds-1) UNRELEASED; urgency=medium
+argh (1.3.1+ds-1) unstable; urgency=medium
 
   * Initial release (Closes: #970452)
 


=====================================
debian/patches/no_install_cmake_files.patch
=====================================
@@ -1,33 +1,18 @@
-Description: do not install some cmake target interface files
+Description: do not install some cmake target interface files in arch-dependant dir but in /usr/share
 Author: Shayan Doust <hello at shayandoust.me>
 Last-Update: 2020-09-22
 ---
 
---- argh.orig/CMakeLists.txt
-+++ argh/CMakeLists.txt
-@@ -26,7 +26,7 @@
- 	endif()
- endif()
- 
--install(TARGETS argh EXPORT arghTargets)
-+#install(TARGETS argh EXPORT arghTargets)
- 
- if(CMAKE_SYSTEM_NAME STREQUAL Linux)
- # this might be a bit too restrictive, since for other (BSD, ...) this might apply also
-@@ -35,12 +35,12 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -35,8 +35,8 @@ if(CMAKE_SYSTEM_NAME STREQUAL Linux)
  	install(FILES "${CMAKE_CURRENT_LIST_DIR}/argh.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
  	install(FILES "${CMAKE_CURRENT_LIST_DIR}/LICENSE" DESTINATION ${CMAKE_INSTALL_DOCDIR})
  	install(FILES "${CMAKE_CURRENT_LIST_DIR}/README.md" DESTINATION ${CMAKE_INSTALL_DOCDIR})
 -	install(FILES argh-config.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/argh)
 -	install(EXPORT arghTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/argh)
-+	#install(FILES argh-config.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/argh)
-+	#install(EXPORT arghTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/argh)
++	install(FILES argh-config.cmake DESTINATION /usr/share/cmake/Modules/argh)
++	install(EXPORT arghTargets DESTINATION /usr/share/cmake/Modules/argh)
  else()
  	install(FILES "${CMAKE_CURRENT_LIST_DIR}/argh.h" DESTINATION include)
  	install(FILES "${CMAKE_CURRENT_LIST_DIR}/LICENSE" DESTINATION license)
- 	install(FILES "${CMAKE_CURRENT_LIST_DIR}/README.md" DESTINATION .)
--	install(FILES argh-config.cmake DESTINATION CMake)
--	install(EXPORT arghTargets DESTINATION CMake)
-+	#install(FILES argh-config.cmake DESTINATION CMake)
-+	#install(EXPORT arghTargets DESTINATION CMake)
- endif()



View it on GitLab: https://salsa.debian.org/med-team/argh/-/compare/42fd24b12e0a6ef7aeb0b51e639fa56f2dc55411...3e5c14529e07fc25950c7f0e1c7135f63765ae23

-- 
View it on GitLab: https://salsa.debian.org/med-team/argh/-/compare/42fd24b12e0a6ef7aeb0b51e639fa56f2dc55411...3e5c14529e07fc25950c7f0e1c7135f63765ae23
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/20200923/c9e99d0f/attachment-0001.html>