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

Adapt multiarch_findgtk2_fix.diff for new multiarch impl.

Browse Source
This commit is contained in:
Modestas Vainius 2011-06-09 01:16:10 +03:00
parent 392f6fb9bc
commit 7bd05267e2
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -7,6 +7,8 @@ cmake (2.8.4+dfsg.1-4) UNRELEASED; urgency=low
implementation does not need dpkg-dev 1.16, it is entirely backwards implementation does not need dpkg-dev 1.16, it is entirely backwards
compatible with previous releases and in addition, it implements multiarch compatible with previous releases and in addition, it implements multiarch
support for find_package(). support for find_package().
* Adapt multiarch_findgtk2_fix.diff patch to work with
multiarch_basic_support.diff.
-- Modestas Vainius <modax@debian.org> Thu, 09 Jun 2011 00:37:03 +0300 -- Modestas Vainius <modax@debian.org> Thu, 09 Jun 2011 00:37:03 +0300

10
debian/patches/multiarch_findgtk2_fix.diff vendored
View File

@ -8,15 +8,15 @@ Forwarded: no
Last-Update: 2011-06-07 Last-Update: 2011-06-07
Fix FindGTK2.cmake to work with Debian/Ubuntu multiarch library paths. The Fix FindGTK2.cmake to work with Debian/Ubuntu multiarch library paths. The
patch depends on multiarch_library_directory_hack.diff patch. patch depends on multiarch_basic_support.diff patch.
--- a/Modules/FindGTK2.cmake --- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake +++ b/Modules/FindGTK2.cmake
@@ -185,6 +185,7 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hd @@ -187,6 +187,7 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hd
find_path(${_var} ${_hdr}
PATHS PATHS
+ /usr/lib/${CMAKE_ARCH_TRIPLET}
/usr/local/lib64 /usr/local/lib64
/usr/local/lib /usr/local/lib
+ /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}
/usr/lib64 /usr/lib64
/usr/lib
/opt/gnome/include