reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-11-23 19:49:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

FindRuby: Update MSVC runtime library selection

Browse Source 
Use the `MSVC_TOOLSET_VERSION` variable computed by CMake to get the
matching Ruby library name component.

Inspired-by: Julien Marrec <julien.marrec@gmail.com>
This commit is contained in:
Brad King 2020-03-17 08:39:06 -04:00
parent b970e25d98
commit 675eaf3bd0
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Modules/FindRuby.cmake
View File

@ -242,21 +242,10 @@ endif()
set(_Ruby_POSSIBLE_LIB_NAMES ruby ruby-static ruby${_Ruby_VERSION_SHORT} ruby${_Ruby_VERSION_SHORT_NODOT} ruby-${_Ruby_VERSION_SHORT} ruby-${Ruby_VERSION})
if(WIN32)
set( _Ruby_MSVC_RUNTIME "" )
if( MSVC_VERSION EQUAL 1200 )
set( _Ruby_MSVC_RUNTIME "60" )
endif()
if( MSVC_VERSION EQUAL 1300 )
set( _Ruby_MSVC_RUNTIME "70" )
endif()
if( MSVC_VERSION EQUAL 1310 )
set( _Ruby_MSVC_RUNTIME "71" )
endif()
if( MSVC_VERSION EQUAL 1400 )
set( _Ruby_MSVC_RUNTIME "80" )
endif()
if( MSVC_VERSION EQUAL 1500 )
set( _Ruby_MSVC_RUNTIME "90" )
if(MSVC_TOOLSET_VERSION)
set(_Ruby_MSVC_RUNTIME "${MSVC_TOOLSET_VERSION}")
else()
set(_Ruby_MSVC_RUNTIME "")
endif()
set(_Ruby_ARCH_PREFIX "")