Lubuntu/cmake
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix multiarch regex to support arm*

Browse Source 
... and (hopefully) all other possible linux architectures. Quadtriplet support
is included even if it is rare.

Patch multiarch_basic_support.diff updated.
This commit is contained in:
Modestas Vainius 2011-06-11 22:20:20 +03:00
parent f2a8b2428a
commit 46f54f9bc9
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -1,5 +1,7 @@
cmake (2.8.4+dfsg.1-5) UNRELEASED; urgency=low
* Fix multiarch regex to support armel and (hopefully) all other possible
linux architectures (patch multiarch_basic_support.diff updated).
-- Modestas Vainius <modax@debian.org> Sat, 11 Jun 2011 22:15:57 +0300

2
debian/patches/multiarch_basic_support.diff vendored
View File

@ -109,7 +109,7 @@ search <prefix>/lib/<arch> whenever they would search <prefix>/lib.
ENDIF(DEFINED CMAKE_INSTALL_SO_NO_EXE)
+# Match multiarch library directory names.
+SET(CMAKE_LIBRARY_ARCHITECTURE_REGEX "[a-z0-9_]+-linux-gnu")
+SET(CMAKE_LIBRARY_ARCHITECTURE_REGEX "[a-z0-9_]+(-[a-z0-9_]+)?-linux-gnu[a-z0-9_]*")
+
INCLUDE(Platform/UnixPaths)