diff options
| author | Brad King <brad.king@kitware.com> | 2017-03-23 12:44:11 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-03-23 12:44:22 (GMT) |
| commit | a1440504ffd18f155404b8bf44466172e9a8054d (patch) | |
| tree | 5c9e3c86e0b65d42e2c70afeff5b97767625835e | |
| parent | e978a2e5b135e25d6654570a6ed948bd5b0f33dc (diff) | |
| parent | 9ab966a722bbe08615d6d5d4a82fd27aab64d315 (diff) | |
| download | CMake-a1440504ffd18f155404b8bf44466172e9a8054d.zip CMake-a1440504ffd18f155404b8bf44466172e9a8054d.tar.gz CMake-a1440504ffd18f155404b8bf44466172e9a8054d.tar.bz2 | |
Merge topic 'avoid-MSVC-per-version-vars'
9ab966a7 FindRuby: Use `MSVC_VERSION` instead of `MSVC##`
69b9fde1 FindGTK2: Use `MSVC_VERSION` instead of `MSVC##`
3fe31822 FindBoost: Avoid mentioning discouraged `MSVC##`` variable
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !610
| -rw-r--r-- | Modules/FindBoost.cmake | 2 | ||||
| -rw-r--r-- | Modules/FindGTK2.cmake | 10 | ||||
| -rw-r--r-- | Modules/FindRuby.cmake | 10 |
3 files changed, 11 insertions, 11 deletions
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake index 2886381..a6f63f5 100644 --- a/Modules/FindBoost.cmake +++ b/Modules/FindBoost.cmake @@ -445,7 +445,7 @@ function(_Boost_GUESS_COMPILER_PREFIX _ret) set(_boost_COMPILER "-vc71") elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 13) # Good luck! set(_boost_COMPILER "-vc7") # yes, this is correct - else() # MSVC60 Good luck! + else() # VS 6.0 Good luck! set(_boost_COMPILER "-vc6") # yes, this is correct endif() elseif (BORLAND) diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake index 2eca5f9..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 @@ -354,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() diff --git a/Modules/FindRuby.cmake b/Modules/FindRuby.cmake index b0e9b47..a9f8d35 100644 --- a/Modules/FindRuby.cmake +++ b/Modules/FindRuby.cmake @@ -207,19 +207,19 @@ set(_RUBY_POSSIBLE_LIB_NAMES ruby ruby-static ruby${_RUBY_VERSION_SHORT} ruby${_ if(WIN32) set( _RUBY_MSVC_RUNTIME "" ) - if( MSVC60 ) + if( MSVC_VERSION EQUAL 1200 ) set( _RUBY_MSVC_RUNTIME "60" ) endif() - if( MSVC70 ) + if( MSVC_VERSION EQUAL 1300 ) set( _RUBY_MSVC_RUNTIME "70" ) endif() - if( MSVC71 ) + if( MSVC_VERSION EQUAL 1310 ) set( _RUBY_MSVC_RUNTIME "71" ) endif() - if( MSVC80 ) + if( MSVC_VERSION EQUAL 1400 ) set( _RUBY_MSVC_RUNTIME "80" ) endif() - if( MSVC90 ) + if( MSVC_VERSION EQUAL 1500 ) set( _RUBY_MSVC_RUNTIME "90" ) endif() |