[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-278-g84c1cea

[Brad King]

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  84c1cea905340971bc168f07cbd9114cfa86ceb4 (commit)
       via  2ab118a8591d8b27ae89de8f3c65b5797fd01dc2 (commit)
      from  76fbab5740aae8fbc9cd7566af34cc0b86909aea (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=84c1cea905340971bc168f07cbd9114cfa86ceb4
commit 84c1cea905340971bc168f07cbd9114cfa86ceb4
Merge: 76fbab5 2ab118a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 20 14:04:06 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 20 14:04:06 2017 -0500

    Merge topic 'FindGTK2-old-sigc++' into next
    
    2ab118a8 FindGTK2: handle old libsigc++ versions


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2ab118a8591d8b27ae89de8f3c65b5797fd01dc2
commit 2ab118a8591d8b27ae89de8f3c65b5797fd01dc2
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Mon Feb 20 10:21:06 2017 -0500
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Mon Feb 20 11:58:57 2017 -0500

    FindGTK2: handle old libsigc++ versions
    
    Old versions of `libsigc++` do not have the version macros inside of its
    `sigc++config.h` header. Assume nothing about such headers and report
    version "zero".
    
    Fixes: #16654

diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index 6747be5..20d7924 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -223,7 +223,10 @@ function(_GTK2_SIGCXX_GET_VERSION _OUT_major _OUT_minor _OUT_micro _sigcxxversio
         set(${_OUT_minor} ${${_OUT_minor}} PARENT_SCOPE)
         set(${_OUT_micro} ${${_OUT_micro}} PARENT_SCOPE)
     else()
-        message(FATAL_ERROR "Include file ${_gtkversion_hdr} does not exist")
+        # The header does not have the version macros; assume it is ``0.0.0``.
+        set(${_OUT_major} 0)
+        set(${_OUT_minor} 0)
+        set(${_OUT_micro} 0)
     endif()
 endfunction()
 

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

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


hooks/post-receive
-- 
CMake