[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2867-gca9de4c

[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  ca9de4cc7f66f6f2d60fdea90a74b7a0e53ac35a (commit)
       via  eb1630112dcc39ae5ccad3753c5991a33d505f5e (commit)
      from  f24861dd91ce32431ad300a6d5935be4980be075 (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=ca9de4cc7f66f6f2d60fdea90a74b7a0e53ac35a
commit ca9de4cc7f66f6f2d60fdea90a74b7a0e53ac35a
Merge: f24861d eb16301
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 1 09:41:54 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 1 09:41:54 2013 -0400

    Merge topic 'FindGTK2vs11' into next
    
    eb16301 FindGTK2: Do not fail on MSVC11 if vc100 libraries are available


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eb1630112dcc39ae5ccad3753c5991a33d505f5e
commit eb1630112dcc39ae5ccad3753c5991a33d505f5e
Author:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Sat Jun 29 15:27:58 2013 +0200
Commit:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
CommitDate: Sat Jun 29 15:27:58 2013 +0200

    FindGTK2: Do not fail on MSVC11 if vc100 libraries are available

diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index f398c79..c466633 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -269,6 +269,9 @@ function(_GTK2_FIND_LIBRARY _var _lib _expand_vc _append_version)
             set(_library   ${_library}-vc90)
         elseif(MSVC10)
             set(_library ${_library}-vc100)
+        elseif(MSVC11)
+            # Up to gtkmm-win 2.22.0-2 there are no vc110 libraries but vc100 can be used
+            set(_library ${_library}-vc100)
         endif()
         set(_library_d ${_library}-d)
     endif()

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

Summary of changes:
 Modules/FindGTK2.cmake |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake