[arch-commits] Commit in yaml-cpp/trunk (2 files)

[Sven-Hendrik Haase]

    Date: Monday, April 10, 2017 @ 20:04:45
  Author: svenstaro
Revision: 221935

upgpkg: yaml-cpp 0.5.3-2

Fix cmake things

Added:
  yaml-cpp/trunk/500db60f899ae6845039d4eca503133d0db81dbd.patch
Modified:
  yaml-cpp/trunk/PKGBUILD

------------------------------------------------+
 500db60f899ae6845039d4eca503133d0db81dbd.patch |   79 +++++++++++++++++++++++
 PKGBUILD                                       |   17 ++--
 2 files changed, 89 insertions(+), 7 deletions(-)

Added: 500db60f899ae6845039d4eca503133d0db81dbd.patch
===================================================================
--- 500db60f899ae6845039d4eca503133d0db81dbd.patch	                        (rev 0)
+++ 500db60f899ae6845039d4eca503133d0db81dbd.patch	2017-04-10 20:04:45 UTC (rev 221935)
@@ -0,0 +1,79 @@
+From 500db60f899ae6845039d4eca503133d0db81dbd Mon Sep 17 00:00:00 2001
+From: Paul Novotny <paul at paulnovo.us>
+Date: Wed, 25 Nov 2015 11:33:36 -0500
+Subject: [PATCH] Include cmake files in install
+
+This adds yaml-cpp-config.cmake, yaml-cpp-config-version.cmake, and
+yaml-cpp-targets.cmake to the cmake install. As a result, cmake's
+find_package can easily find yaml-cpp for software that depends on
+yaml-cpp.
+
+Add code to install cmake files to $CMAKE_INSTALL_PREFIX/CMake on
+Windows, which is the de-facto standard.
+
+Closes jbeder/yaml-cpp#336 jbeder/yaml-cpp#127
+---
+ CMakeLists.txt | 28 +++++++++++++++++++++++-----
+ 1 file changed, 23 insertions(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5b326a3..cbaad07 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -256,15 +256,15 @@ else()
+ 	set(_library_dir lib)
+ endif()
+ 
+-set(INCLUDE_INSTALL_ROOT_DIR include)
++set(INCLUDE_INSTALL_ROOT_DIR ${CMAKE_INSTALL_PREFIX}/include)
+ 
+ set(INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_ROOT_DIR}/yaml-cpp)
+-set(LIB_INSTALL_DIR "${_library_dir}${LIB_SUFFIX}")
++set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${_library_dir}${LIB_SUFFIX}")
+ 
+ set(_INSTALL_DESTINATIONS
+-	RUNTIME DESTINATION bin
++	RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
+ 	LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+-	ARCHIVE DESTINATION "lib${LIB_SUFFIX}"
++	ARCHIVE DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}"
+ )
+ 
+ 
+@@ -300,7 +300,7 @@ if(MSVC)
+ 	endif()
+ endif()
+ 
+-install(TARGETS yaml-cpp ${_INSTALL_DESTINATIONS})
++install(TARGETS yaml-cpp EXPORT yaml-cpp-targets ${_INSTALL_DESTINATIONS})
+ install(
+ 	DIRECTORY ${header_directory}
+ 	DESTINATION ${INCLUDE_INSTALL_DIR}
+@@ -316,9 +316,27 @@ set(EXPORT_TARGETS yaml-cpp CACHE INTERNAL "export targets")
+ set(CONFIG_INCLUDE_DIRS "${YAML_CPP_SOURCE_DIR}/include")
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/yaml-cpp-config.cmake.in
+ 	"${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake" @ONLY)
++
++if(WIN32 AND NOT CYGWIN)
++	set(INSTALL_CMAKE_DIR ${CMAKE_INSTALL_PREFIX}/CMake)
++else()
++	set(INSTALL_CMAKE_DIR ${LIB_INSTALL_DIR}/cmake/yaml-cpp)
++endif()
++
++file(RELATIVE_PATH REL_INCLUDE_DIR "${INSTALL_CMAKE_DIR}" "${INCLUDE_INSTALL_ROOT_DIR}")
++set(CONFIG_INCLUDE_DIRS "\${YAML_CPP_CMAKE_DIR}/${REL_INCLUDE_DIR}")
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/yaml-cpp-config.cmake.in
++	"${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/yaml-cpp-config.cmake" @ONLY)
++
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/yaml-cpp-config-version.cmake.in
+ 	"${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake" @ONLY)
+ 
++install(FILES
++	"${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/yaml-cpp-config.cmake"
++	"${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake"
++	DESTINATION "${INSTALL_CMAKE_DIR}" COMPONENT dev)
++install(EXPORT yaml-cpp-targets DESTINATION ${INSTALL_CMAKE_DIR})
++
+ if(UNIX)
+ 	set(PC_FILE ${CMAKE_BINARY_DIR}/yaml-cpp.pc)
+ 	configure_file("yaml-cpp.pc.cmake" ${PC_FILE} @ONLY)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-04-10 19:59:13 UTC (rev 221934)
+++ PKGBUILD	2017-04-10 20:04:45 UTC (rev 221935)
@@ -4,7 +4,7 @@
 
 pkgname=yaml-cpp
 pkgver=0.5.3
-pkgrel=1
+pkgrel=2
 pkgdesc="YAML parser and emitter in C++, written around the YAML 1.2 spec"
 url="https://github.com/jbeder/yaml-cpp"
 arch=('i686' 'x86_64')
@@ -11,9 +11,16 @@
 license=('MIT')
 depends=('gcc-libs')
 makedepends=('boost' 'cmake')
-source=(https://github.com/jbeder/yaml-cpp/archive/release-${pkgver}.tar.gz)
-md5sums=('64200ca0bf5e0af065804d8d3e8f6d42')
+source=(https://github.com/jbeder/yaml-cpp/archive/release-${pkgver}.tar.gz
+        500db60f899ae6845039d4eca503133d0db81dbd.patch)
+sha512sums=('5ed15fee3c6455c08e6bd8f74256b230f274ef18f8e144491e940640e41626517c7eaaf4a1f380c4179066a2a757c8a0f61878df9dc3caa15e37c4954be47fe0'
+            '8ffd7dd7deaf3eef8ce5eefac73d4a453c86f852cd93579b0e3edcd3b174fd52b2a8a6ef37e5588a3d3f85dde3bdf53bc4b385e2b24c4e46a8cd00af75161ae0')
 
+prepare() {
+    cd $srcdir/$pkgname-release-$pkgver
+    patch -Np1 < $srcdir/500db60f899ae6845039d4eca503133d0db81dbd.patch
+}
+
 build() {
     cd $srcdir/$pkgname-release-$pkgver
 
@@ -26,9 +33,5 @@
 
     make DESTDIR=$pkgdir install
 
-    install -Dm644 yaml-cpp-config.cmake $pkgdir/usr/lib/cmake/${pkgname}/yaml-cpp-config.cmake
-    install -Dm644 yaml-cpp-config-version.cmake $pkgdir/usr/lib/cmake/${pkgname}/yaml-cpp-config-version.cmake
-    install -Dm644 yaml-cpp-targets.cmake $pkgdir/usr/lib/cmake/${pkgname}/yaml-cpp-targets.cmake
-
     install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }