[glm] 02/03: Fix CMake detection on all architectures

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch debian/master
in repository glm.

commit 5e53cc348c5738777c2a7b77e89eb0fd00bf1524
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Wed Jan 11 14:42:07 2017 +0000

    Fix CMake detection on all architectures
    
    - New patch Fix-CMake-package-version-file.patch
    
    Gbp-Dch: full
    Closes: #850277, #850243
---
 .../patches/Fix-CMake-package-version-file.patch   | 29 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 30 insertions(+)

diff --git a/debian/patches/Fix-CMake-package-version-file.patch b/debian/patches/Fix-CMake-package-version-file.patch
new file mode 100644
index 0000000..3b43fa8
--- /dev/null
+++ b/debian/patches/Fix-CMake-package-version-file.patch
@@ -0,0 +1,29 @@
+From: Ghislain Antony Vaillant <ghisvail at gmail.com>
+Date: Wed, 11 Jan 2017 14:36:38 +0000
+Subject: Fix CMake package version file
+
+---
+ CMakeLists.txt | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 253eee5..2c68e8a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -163,11 +163,16 @@ add_subdirectory(test)
+ set(GLM_INSTALL_CONFIGDIR "${CMAKE_INSTALL_LIBDIR}/cmake/glm")
+ install(DIRECTORY glm DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ 
++# CMAKE_SIZEOF_VOID_P is temporarily unset to make the generated package
++# version file architecture-independent.
++set(_glm_CMAKE_SIZEOF_VOID_P ${CMAKE_SIZEOF_VOID_P})
++unset(CMAKE_SIZEOF_VOID_P)
+ write_basic_package_version_file(
+     "${CMAKE_CURRENT_BINARY_DIR}/glmConfigVersion.cmake"
+     VERSION ${GLM_VERSION}
+     COMPATIBILITY AnyNewerVersion
+ )
++set(CMAKE_SIZEOF_VOID_P ${_glm_CMAKE_SIZEOF_VOID_P})
+ 
+ # build tree package config
+ configure_file(
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..85f3cb9
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+Fix-CMake-package-version-file.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/glm.git