[Cmake-commits] CMake branch, next, updated. v2.8.9-995-gdd7e797
Philip Lowman
philip at yhbt.com
Thu Oct 4 01:10:27 EDT 2012
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via dd7e7979b4c7a28ecf13c5ef7e77fc756998be55 (commit)
via 0594bee578fbe017f8ef194557b4cddfa12b7dae (commit)
via 8093f6cedea37b488a1e7f61bc363e149fa43428 (commit)
via 06638039aaa01c5431e6b4f0c153390afbe82c46 (commit)
via b74267745b012e1f3769ea5a7802c79f5480852b (commit)
from 19321e4f3055898ccb816bcdc3747f60c40d2f1b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dd7e7979b4c7a28ecf13c5ef7e77fc756998be55
commit dd7e7979b4c7a28ecf13c5ef7e77fc756998be55
Merge: 19321e4 0594bee
Author: Philip Lowman <philip at yhbt.com>
AuthorDate: Thu Oct 4 01:10:25 2012 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 4 01:10:25 2012 -0400
Merge topic 'FindGTK2Fixes' into next
0594bee FindGTK2: Update local changelog
8093f6c FindGTK2: #12596 Missing paths for FindGTK2 on NetBSD
0663803 FindGTK2: #12049 fix detection of header files on multiarch systems
b742677 FindGTK2: Rollback lib64 changes which broke header file finding
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0594bee578fbe017f8ef194557b4cddfa12b7dae
commit 0594bee578fbe017f8ef194557b4cddfa12b7dae
Author: Philip Lowman <philip at yhbt.com>
AuthorDate: Wed Oct 3 05:03:53 2012 -0400
Commit: Philip Lowman <philip at yhbt.com>
CommitDate: Wed Oct 3 05:03:53 2012 -0400
FindGTK2: Update local changelog
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index b9be78a..517a9ac 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -54,7 +54,7 @@
#=============================================================================
# Copyright 2009 Kitware, Inc.
-# Copyright 2008-2009 Philip Lowman <philip at yhbt.com>
+# Copyright 2008-2012 Philip Lowman <philip at yhbt.com>
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
@@ -66,10 +66,13 @@
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
+# Version 1.4 (10/4/2012) (CMake 2.8.10)
+# * 12596: Missing paths for FindGTK2 on NetBSD
+# * 12049: Fixed detection of GTK include files in the lib folder on
+# multiarch systems.
# Version 1.3 (11/9/2010) (CMake 2.8.4)
# * 11429: Add support for detecting GTK2 built with Visual Studio 10.
# Thanks to Vincent Levesque for the patch.
-
# Version 1.2 (8/30/2010) (CMake 2.8.3)
# * Merge patch for detecting gdk-pixbuf library (split off
# from core GTK in 2.21). Thanks to Vincent Untz for the patch
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8093f6cedea37b488a1e7f61bc363e149fa43428
commit 8093f6cedea37b488a1e7f61bc363e149fa43428
Author: Philip Lowman <philip at yhbt.com>
AuthorDate: Wed Oct 3 04:57:45 2012 -0400
Commit: Philip Lowman <philip at yhbt.com>
CommitDate: Wed Oct 3 04:57:45 2012 -0400
FindGTK2: #12596 Missing paths for FindGTK2 on NetBSD
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index 119ad0e..b9be78a 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -211,6 +211,8 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hdr)
/sw/lib
/opt/local/include
/opt/local/lib
+ /usr/pkg/lib
+ /usr/pkg/include/glib
$ENV{GTKMM_BASEPATH}/include
$ENV{GTKMM_BASEPATH}/lib
[HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]/include
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=06638039aaa01c5431e6b4f0c153390afbe82c46
commit 06638039aaa01c5431e6b4f0c153390afbe82c46
Author: Philip Lowman <philip at yhbt.com>
AuthorDate: Wed Oct 3 04:52:35 2012 -0400
Commit: Philip Lowman <philip at yhbt.com>
CommitDate: Wed Oct 3 04:52:35 2012 -0400
FindGTK2: #12049 fix detection of header files on multiarch systems
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index 2373422..119ad0e 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -190,8 +190,15 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hdr)
"include suffixes = ${_suffixes}")
endif()
+ if(CMAKE_LIBRARY_ARCHITECTURE)
+ set(_gtk2_arch_dir /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE})
+ if(GTK2_DEBUG)
+ message(STATUS "Adding ${_gtk2_arch_dir} to search path for multiarch support")
+ endif()
+ endif()
find_path(${_var} ${_hdr}
PATHS
+ ${_gtk2_arch_dir}
/usr/local/lib64
/usr/local/lib
/usr/lib64
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b74267745b012e1f3769ea5a7802c79f5480852b
commit b74267745b012e1f3769ea5a7802c79f5480852b
Author: Philip Lowman <philip at yhbt.com>
AuthorDate: Wed Oct 3 04:45:22 2012 -0400
Commit: Philip Lowman <philip at yhbt.com>
CommitDate: Wed Oct 3 04:45:22 2012 -0400
FindGTK2: Rollback lib64 changes which broke header file finding
The changes in "use PATH_SUFFIXES to simplify find_* calls" on 8/14
regressed important functionality in FindGTK for using find_path to
locate header files in <prefix>/lib/<gtk_package>/include.
The find_path function doesn't search <prefix>/lib only <prefix>/include.
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index 49af0f2..2373422 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -151,7 +151,7 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hdr)
"_GTK2_FIND_INCLUDE_DIR( ${_var} ${_hdr} )")
endif()
- set(_relatives
+ set(_gtk_packages
# If these ever change, things will break.
${GTK2_ADDITIONAL_SUFFIXES}
glibmm-2.4
@@ -172,8 +172,15 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hdr)
sigc++-2.0
)
- set(_suffixes include lib)
- foreach(_d ${_relatives})
+ #
+ # NOTE: The following suffixes cause searching for header files in both of
+ # these directories:
+ # /usr/include/<pkg>
+ # /usr/lib/<pkg>/include
+ #
+
+ set(_suffixes)
+ foreach(_d ${_gtk_packages})
list(APPEND _suffixes ${_d})
list(APPEND _suffixes ${_d}/include) # for /usr/lib/gtk-2.0/include
endforeach()
@@ -186,15 +193,23 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hdr)
find_path(${_var} ${_hdr}
PATHS
/usr/local/lib64
+ /usr/local/lib
/usr/lib64
- /opt/gnome
- /opt/openwin
- /usr/openwin
- /sw
- /opt/local
- ENV GTKMM_BASEPATH
- [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
+ /usr/lib
+ /opt/gnome/include
+ /opt/gnome/lib
+ /opt/openwin/include
+ /usr/openwin/lib
+ /sw/include
+ /sw/lib
+ /opt/local/include
+ /opt/local/lib
+ $ENV{GTKMM_BASEPATH}/include
+ $ENV{GTKMM_BASEPATH}/lib
+ [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]/include
+ [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]/lib
+ [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]/include
+ [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]/lib
PATH_SUFFIXES
${_suffixes}
)
-----------------------------------------------------------------------
Summary of changes:
Modules/FindGTK2.cmake | 53 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 40 insertions(+), 13 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list