[glfw3] 01/03: Fix and ship the cmake config files (Closes: #812853)

[James Cowgill]

This is an automated email from the git hooks/post-receive script.

jcowgill-guest pushed a commit to branch master
in repository glfw3.

commit 6e20c89b2b48e03d933cd61aa5fc6268e13ee3c9
Author: James Cowgill <james410 at cowgill.org.uk>
Date:   Wed Jan 27 11:51:45 2016 +0000

    Fix and ship the cmake config files (Closes: #812853)
---
 debian/libglfw3-dev.install             |  1 +
 debian/patches/cmake-config-fixes.patch | 28 ++++++++++++++++++++++++++++
 debian/patches/series                   |  1 +
 3 files changed, 30 insertions(+)

diff --git a/debian/libglfw3-dev.install b/debian/libglfw3-dev.install
index 7df81cd..7755ba3 100644
--- a/debian/libglfw3-dev.install
+++ b/debian/libglfw3-dev.install
@@ -1,3 +1,4 @@
 usr/include/*
+usr/lib/*/cmake/*
 usr/lib/*/lib*.so
 usr/lib/*/pkgconfig/*
diff --git a/debian/patches/cmake-config-fixes.patch b/debian/patches/cmake-config-fixes.patch
new file mode 100644
index 0000000..3cf6f8e
--- /dev/null
+++ b/debian/patches/cmake-config-fixes.patch
@@ -0,0 +1,28 @@
+Description: Fix various paths in the CMake config files
+ Based on commits in https://github.com/glfw/glfw/pull/460
+Author: James Cowgill <james410 at cowgill.org.uk>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -479,7 +479,7 @@
+ include(CMakePackageConfigHelpers)
+ 
+ if (UNIX)
+-    set(GLFW_CONFIG_PATH "${CMAKE_INSTALL_PREFIX}/lib/cmake/glfw3/")
++    set(GLFW_CONFIG_PATH "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/cmake/glfw3/")
+ else()
+     set(GLFW_CONFIG_PATH "${CMAKE_INSTALL_PREFIX}/")
+ endif()
+@@ -532,9 +532,9 @@
+ 
+     install(FILES "${GLFW_BINARY_DIR}/src/glfw3Config.cmake"
+                   "${GLFW_BINARY_DIR}/src/glfw3ConfigVersion.cmake"
+-            DESTINATION lib${LIB_SUFFIX}/cmake/glfw)
++            DESTINATION ${GLFW_CONFIG_PATH})
+ 
+-    install(EXPORT glfwTargets DESTINATION lib${LIB_SUFFIX}/cmake/glfw)
++    install(EXPORT glfwTargets DESTINATION ${GLFW_CONFIG_PATH})
+     install(FILES "${GLFW_BINARY_DIR}/src/glfw3.pc"
+             DESTINATION lib${LIB_SUFFIX}/pkgconfig)
+ 
diff --git a/debian/patches/series b/debian/patches/series
index f1bf1cb..90b7556 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 reproducible-docs.patch
+cmake-config-fixes.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/glfw3.git