[Cmake-commits] CMake branch, next, updated. v3.0.1-5084-g19b17e6

[Chuck Atkins]

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  19b17e61df12fd21bae28b53b1c1231edb9c0e00 (commit)
       via  268ab7cc8861ba6afe312f901345f320a11e7053 (commit)
      from  496d0357f9273304bfe6d706ca6a42e8f80f2bf0 (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=19b17e61df12fd21bae28b53b1c1231edb9c0e00
commit 19b17e61df12fd21bae28b53b1c1231edb9c0e00
Merge: 496d035 268ab7c
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Mon Sep 1 14:27:46 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 1 14:27:46 2014 -0400

    Merge topic 'fix-gtk2-missing-optional-includes' into next
    
    268ab7cc FindGTK2: Fix missing optional include dirs.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=268ab7cc8861ba6afe312f901345f320a11e7053
commit 268ab7cc8861ba6afe312f901345f320a11e7053
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Mon Sep 1 13:40:27 2014 -0400
Commit:     Chuck Atkins <chuck.atkins at kitware.com>
CommitDate: Mon Sep 1 14:10:57 2014 -0400

    FindGTK2: Fix missing optional include dirs.
    
    FindGTK2 was adding optional include directories to the
    interface include dirs regardless of whether or not they
    existed.  This ensures that the directories only get added
    if they are actually found. This is particularly a problem
    on Solaris where the gtk2 libs and headers might exist but
    the FreeType2 headers might not.

diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index eaa5e55..e09dc99 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -540,7 +540,11 @@ function(_GTK2_ADD_TARGET _var)
         endif()
 
         if(_${_var}_OPTIONAL_INCLUDES)
-            _GTK2_ADD_TARGET_INCLUDE_DIRS(${_var} ${_${_var}_OPTIONAL_INCLUDES})
+            foreach(_D ${_${_var}_OPTIONAL_INCLUDES})
+                if(NOT (_D MATCHES "-NOTFOUND\$"))
+                    _GTK2_ADD_TARGET_INCLUDE_DIRS(${_var} ${_D})
+                endif()
+            endforeach()
         endif()
 
         if(GTK2_USE_IMPORTED_TARGETS)

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindGTK2.cmake |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake