diff options
Diffstat (limited to 'Modules/FindGTK2.cmake')
| -rw-r--r-- | Modules/FindGTK2.cmake | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake index 20d7924..b87b9f3 100644 --- a/Modules/FindGTK2.cmake +++ b/Modules/FindGTK2.cmake @@ -105,7 +105,7 @@ # * 14236: Detect gthread library # Detect pangocairo on windows # Detect pangocairo with gtk module instead of with gtkmm -# * 14259: Use vc100 libraries with MSVC11 +# * 14259: Use vc100 libraries with VS 11 # * 14260: Export a GTK2_DEFINITIONS variable to set /vd2 when appropriate # (i.e. MSVC) # * Use the optimized/debug syntax for _LIBRARY and _LIBRARIES variables when @@ -292,8 +292,10 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hdr) find_path(GTK2_${_var}_INCLUDE_DIR ${_hdr} PATHS ${_gtk2_arch_dir} + /usr/local/libx32 /usr/local/lib64 /usr/local/lib + /usr/libx32 /usr/lib64 /usr/lib /usr/X11R6/include @@ -352,13 +354,13 @@ function(_GTK2_FIND_LIBRARY _var _lib _expand_vc _append_version) if(_expand_vc AND MSVC) # Add vc80/vc90/vc100 midfixes - if(MSVC80) + if(MSVC_VERSION EQUAL 1400) set(_library ${_library}-vc80) - elseif(MSVC90) + elseif(MSVC_VERSION EQUAL 1500) set(_library ${_library}-vc90) - elseif(MSVC10) + elseif(MSVC_VERSION EQUAL 1600) set(_library ${_library}-vc100) - elseif(MSVC11) + elseif(MSVC_VERSION EQUAL 1700) # Up to gtkmm-win 2.22.0-2 there are no vc110 libraries but vc100 can be used set(_library ${_library}-vc100) endif() |