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.
This commit is contained in:
parent
745671441d
commit
1321eb9796
|
@ -66,6 +66,10 @@
|
||||||
# (To distribute this file outside of CMake, substitute the full
|
# (To distribute this file outside of CMake, substitute the full
|
||||||
# License text for the above reference.)
|
# 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)
|
# Version 1.2 (8/30/2010) (CMake 2.8.3)
|
||||||
# * Merge patch for detecting gdk-pixbuf library (split off
|
# * Merge patch for detecting gdk-pixbuf library (split off
|
||||||
# from core GTK in 2.21). Thanks to Vincent Untz for the patch
|
# 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})
|
set(_library ${_lib})
|
||||||
|
|
||||||
if(_expand_vc)
|
if(_expand_vc AND MSVC)
|
||||||
# Add vc80/vc90 midfixes
|
# Add vc80/vc90/vc100 midfixes
|
||||||
if(MSVC80)
|
if(MSVC80)
|
||||||
set(_library ${_library}-vc80)
|
set(_library ${_library}-vc80)
|
||||||
set(_library_d ${_library}-d)
|
|
||||||
elseif(MSVC90)
|
elseif(MSVC90)
|
||||||
set(_library ${_library}-vc90)
|
set(_library ${_library}-vc90)
|
||||||
set(_library_d ${_library}-d)
|
elseif(MSVC10)
|
||||||
|
set(_library ${_library}-vc100)
|
||||||
endif()
|
endif()
|
||||||
|
set(_library_d ${_library}-d)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(GTK2_DEBUG)
|
if(GTK2_DEBUG)
|
||||||
|
|
Loading…
Reference in New Issue