~ubuntu-branches/ubuntu/precise/cmake/precise

« back to all changes in this revision

Viewing changes to Modules/Platform/Linux.cmake

  • Committer: Bazaar Package Importer
  • Author(s): Modestas Vainius
  • Date: 2011-06-11 22:47:18 UTC
  • mfrom: (3.1.22 sid)
  • Revision ID: james.westby@ubuntu.com-20110611224718-3z40sik66z6a12f2
Tags: 2.8.4+dfsg.1-5
* Fix multiarch regex to support armel and (hopefully) all other possible
  linux architectures (patch multiarch_basic_support.diff updated).
* Support multiarch paths on kfreebsd and hurd (patch
  multiarch_basic_support.diff updated). (Closes: #630167)
* Urgency=medium, the bugs above make cmake almost unusable on armel and
  kfreebsd.

Show diffs side-by-side

added added

removed removed

Lines of Context:
46
46
ENDIF(DEFINED CMAKE_INSTALL_SO_NO_EXE)
47
47
 
48
48
# Match multiarch library directory names.
49
 
SET(CMAKE_LIBRARY_ARCHITECTURE_REGEX "[a-z0-9_]+-linux-gnu")
 
49
SET(CMAKE_LIBRARY_ARCHITECTURE_REGEX "[a-z0-9_]+(-[a-z0-9_]+)?-linux-gnu[a-z0-9_]*")
50
50
 
51
51
INCLUDE(Platform/UnixPaths)
52
52