Install to multiarch libdir on kFreeBSD and Hurd like on Linux.

Thanks to John Stamp
Patch: install_to_multiarch_libdir_on_kfreebsd_hurd.diff
(Closes: #684956)
ci/unstable
Modestas Vainius 13 years ago
parent 89ed41c79f
commit 8f01d6797f

3
debian/changelog vendored

@ -5,6 +5,9 @@ cmake (2.8.9-1) UNRELEASED; urgency=low
Radigales and Gregor Jasny. (Closes: #665721)
Patch: FindPostgreSQL_665721.diff
* Refresh patches.
* Install to multiarch libdir on kFreeBSD and Hurd like on Linux. Thanks
to John Stamp (Closes: #684956)
Patch: install_to_multiarch_libdir_on_kfreebsd_hurd.diff
-- Modestas Vainius <modax@debian.org> Sat, 18 Aug 2012 22:36:44 +0300

@ -0,0 +1,20 @@
From: John Stamp <jstamp@users.sourceforge.net>
Subject: Install to multiarch libdir when CMAKE_SYSTEM_NAME != Linux
Date: Tue, 14 Aug 2012 22:27:05 -0700
Origin: other, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=684956#5
Last-Update: 2012-08-18
Bug: http://bugs.debian.org/684956
diff --git a/Modules/GNUInstallDirs.cmake b/Modules/GNUInstallDirs.cmake
index 0302e4b..4dc2d68 100644
--- a/Modules/GNUInstallDirs.cmake
+++ b/Modules/GNUInstallDirs.cmake
@@ -78,7 +78,7 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu"
# See http://wiki.debian.org/Multiarch
- if(CMAKE_SYSTEM_NAME MATCHES "Linux"
+ if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU")
AND NOT CMAKE_CROSSCOMPILING)
if (EXISTS "/etc/debian_version") # is this a debian system ?
if(CMAKE_LIBRARY_ARCHITECTURE)

@ -1,3 +1,4 @@
FindBoost_add_-lpthread_#563479.diff
multiarch_findgtk2_fix.diff
FindPostgreSQL_665721.diff
install_to_multiarch_libdir_on_kfreebsd_hurd.diff

Loading…
Cancel
Save