[Cmake-commits] CMake branch, next, updated. v3.0.1-5135-g3c47e86

[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  3c47e8668104ecdc8fc67dd75679093e98ba7fc3 (commit)
       via  cb8f0f7c813f718bf8a8f8896b52de03bc9c6106 (commit)
      from  540e371df1bd981adcb571947dcec25dc103874a (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=3c47e8668104ecdc8fc67dd75679093e98ba7fc3
commit 3c47e8668104ecdc8fc67dd75679093e98ba7fc3
Merge: 540e371 cb8f0f7
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Wed Sep 3 23:27:46 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 3 23:27:46 2014 -0400

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cb8f0f7c813f718bf8a8f8896b52de03bc9c6106
commit cb8f0f7c813f718bf8a8f8896b52de03bc9c6106
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: Wed Sep 3 23:25: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..67dc0eb 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(_D)
+                    _GTK2_ADD_TARGET_INCLUDE_DIRS(${_var} ${_D})
+                endif()
+            endforeach()
         endif()
 
         if(GTK2_USE_IMPORTED_TARGETS)

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

Summary of changes:


hooks/post-receive
-- 
CMake