diff options
| author | Philip Lowman <philip@yhbt.com> | 2010-11-10 02:43:08 (GMT) |
|---|---|---|
| committer | Philip Lowman <philip@yhbt.com> | 2010-11-10 02:43:08 (GMT) |
| commit | 1321eb979671bb99f4d5c973e633f760fb2e3923 (patch) | |
| tree | 953f38ac28d9636097d75a214741f07f6201ed54 /Modules/FindGTK2.cmake | |
| parent | 745671441d3bcecac171334da350e92ab8b5f7b9 (diff) | |
| download | CMake-1321eb979671bb99f4d5c973e633f760fb2e3923.zip CMake-1321eb979671bb99f4d5c973e633f760fb2e3923.tar.gz CMake-1321eb979671bb99f4d5c973e633f760fb2e3923.tar.bz2 | |
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.
Diffstat (limited to 'Modules/FindGTK2.cmake')
| -rw-r--r-- | Modules/FindGTK2.cmake | 13 |
1 files changed, 9 insertions, 4 deletions
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) |