[Cmake-commits] CMake branch, next, updated. v2.8.3-585-g2e15ab2

[Philip Lowman]

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  2e15ab29663c455d665340f29db59f9db38065b1 (commit)
       via  1321eb979671bb99f4d5c973e633f760fb2e3923 (commit)
      from  78780416750acbe3b551e64df9dc5fa4e6aa0d1d (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=2e15ab29663c455d665340f29db59f9db38065b1
commit 2e15ab29663c455d665340f29db59f9db38065b1
Merge: 7878041 1321eb9
Author:     Philip Lowman <philip at yhbt.com>
AuthorDate: Tue Nov 9 21:46:03 2010 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 9 21:46:03 2010 -0500

    Merge topic '11429_FindGTK2_MSVC10' into next
    
    1321eb9 11429: FindGTK2 does not find libraries built for Visual Studio 2010


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1321eb979671bb99f4d5c973e633f760fb2e3923
commit 1321eb979671bb99f4d5c973e633f760fb2e3923
Author:     Philip Lowman <philip at yhbt.com>
AuthorDate: Tue Nov 9 21:43:08 2010 -0500
Commit:     Philip Lowman <philip at yhbt.com>
CommitDate: Tue Nov 9 21:43:08 2010 -0500

    11429: FindGTK2 does not find libraries built for Visual Studio 2010
    
    Adds support for detecting builds of FindGTK2 with Visual Studio 2010.
    Thanks to Vincent Levesque for the patch.

diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index d8b4f63..1e59946 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -66,6 +66,10 @@
 # (To distribute this file outside of CMake, substitute the full
 #  License text for the above reference.)
 
+# 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
@@ -237,15 +241,16 @@ function(_GTK2_FIND_LIBRARY _var _lib _expand_vc _append_version)
 
     set(_library ${_lib})
 
-    if(_expand_vc)
-        # Add vc80/vc90 midfixes
+    if(_expand_vc AND MSVC)
+        # Add vc80/vc90/vc100 midfixes
         if(MSVC80)
             set(_library   ${_library}-vc80)
-            set(_library_d ${_library}-d)
         elseif(MSVC90)
             set(_library   ${_library}-vc90)
-            set(_library_d ${_library}-d)
+        elseif(MSVC10)
+            set(_library ${_library}-vc100)
         endif()
+        set(_library_d ${_library}-d)
     endif()
 
     if(GTK2_DEBUG)

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

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


hooks/post-receive
-- 
CMake