summaryrefslogtreecommitdiffstats
path: root/Modules/FindGTK2.cmake
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-07-02 13:04:12 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2013-07-02 13:04:12 (GMT)
commit31d55ee8ac92a7cd751bf43b24f684b6c18fda4e (patch)
treeda252907e636c959745ecc98cd7c1f8429ec696f /Modules/FindGTK2.cmake
parent357db89d27f488ca9482d1a9ac1b3073bad40a01 (diff)
parenteb1630112dcc39ae5ccad3753c5991a33d505f5e (diff)
downloadCMake-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/FindGTK2.cmake')
-rw-r--r--Modules/FindGTK2.cmake3
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()