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

Index: cmake-2.8.3/Modules/Platform/UnixPaths.cmake

===================================================================

--- cmake-2.8.3.orig/Modules/Platform/UnixPaths.cmake   2011-03-18 17:29:50.578966348 +0000

+++ cmake-2.8.3/Modules/Platform/UnixPaths.cmake        2011-03-18 17:30:01.388966345 +0000

@@ -73,8 +73,15 @@

   /usr/pkg/bin

   )

 

+EXECUTE_PROCESS(COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH OUTPUT_VARIABLE _ARCH_TRIPLET OUTPUT_STRIP_TRAILING_WHITESPACE)

+

 LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES

   /lib /usr/lib /usr/lib32 /usr/lib64

+  /lib/${_ARCH_TRIPLET} /usr/lib/${_ARCH_TRIPLET}

+  )

+

+LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH

+  /lib/${_ARCH_TRIPLET} /usr/lib/${_ARCH_TRIPLET}

   )

 

 LIST(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES