diff options
| author | Brad King <brad.king@kitware.com> | 2013-07-02 13:04:12 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-07-02 13:04:12 (GMT) |
| commit | 31d55ee8ac92a7cd751bf43b24f684b6c18fda4e (patch) | |
| tree | da252907e636c959745ecc98cd7c1f8429ec696f /Modules | |
| parent | 357db89d27f488ca9482d1a9ac1b3073bad40a01 (diff) | |
| parent | eb1630112dcc39ae5ccad3753c5991a33d505f5e (diff) | |
| download | CMake-31d55ee8ac92a7cd751bf43b24f684b6c18fda4e.zip CMake-31d55ee8ac92a7cd751bf43b24f684b6c18fda4e.tar.gz CMake-31d55ee8ac92a7cd751bf43b24f684b6c18fda4e.tar.bz2 | |
Merge topic 'FindGTK2vs11'
eb16301 FindGTK2: Do not fail on MSVC11 if vc100 libraries are available
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindGTK2.cmake | 3 |
1 files changed, 3 insertions, 0 deletions
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() |