[gli] 01/02: Fix CMake detection for 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 gli.

commit e7ddc1044c4ccf672973dffba12040e2b59ae42c
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Wed Jan 11 14:56:27 2017 +0000

    Fix CMake detection for all architectures
    
    - New patch Fix-CMake-package-version-file.patch
    
    Gbp-Dch: full
    Closes: #851050
---
 .../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..340c434
--- /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:56:03 +0000
+Subject: Fix CMake package version file
+
+---
+ CMakeLists.txt | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ffe7f29..ade04eb 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -88,11 +88,16 @@ add_subdirectory(test)
+ set(GLI_INSTALL_CONFIGDIR "${CMAKE_INSTALL_LIBDIR}/cmake/gli")
+ install(DIRECTORY gli DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ 
++# CMAKE_SIZEOF_VOID_P is temporarily unset to make the generated package
++# version file architecture-independent.
++set(_gli_CMAKE_SIZEOF_VOID_P ${CMAKE_SIZEOF_VOID_P})
++unset(${CMAKE_SIZEOF_VOID_P})
+ write_basic_package_version_file(
+ 	"${CMAKE_CURRENT_BINARY_DIR}/gliVersion.cmake"
+ 	VERSION ${GLI_VERSION}
+ 	COMPATIBILITY AnyNewerVersion
+ )
++set(CMAKE_SIZEOF_VOID_P ${_gli_CMAKE_SIZEOF_VOID_P})
+ 
+ # build tree package config
+ configure_file(
diff --git a/debian/patches/series b/debian/patches/series
index 3c2b2ec..a0f127f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 Use-system-glm.patch
 Fix-path-to-project-logo.patch
 Fix-project-version.patch
+Fix-CMake-package-version-file.patch

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