mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-06 14:19:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

FindRuby: Generalize name of runtime candidates variable

Browse Source
This commit is contained in:
cfis
2025-05-03 16:28:27 -07:00
committed by Brad King
parent ae1ce9048a
commit 13da6bea6e
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/FindRuby.cmake
+6 -6
View File
@@ -389,11 +389,11 @@ endif ()
set(_Ruby_POSSIBLE_LIB_NAMES ruby ruby-static ruby${_Ruby_VERSION_SHORT} ruby${_Ruby_VERSION_SHORT_NODOT} ruby${_Ruby_VERSION_NODOT} ruby-${_Ruby_VERSION_SHORT} ruby-${Ruby_VERSION}) set(_Ruby_POSSIBLE_LIB_NAMES ruby ruby-static ruby${_Ruby_VERSION_SHORT} ruby${_Ruby_VERSION_SHORT_NODOT} ruby${_Ruby_VERSION_NODOT} ruby-${_Ruby_VERSION_SHORT} ruby-${Ruby_VERSION})
if (WIN32) if (WIN32)
set(_Ruby_POSSIBLE_MSVC_RUNTIMES "ucrt;msvcrt;vcruntime140;vcruntime140_1") set(_Ruby_POSSIBLE_RUNTIMES "ucrt;msvcrt;vcruntime140;vcruntime140_1")
if (MSVC_TOOLSET_VERSION) if (MSVC_TOOLSET_VERSION)
list(APPEND _Ruby_POSSIBLE_MSVC_RUNTIMES "msvcr${MSVC_TOOLSET_VERSION}") list(APPEND _Ruby_POSSIBLE_RUNTIMES "msvcr${MSVC_TOOLSET_VERSION}")
else () else ()
list(APPEND _Ruby_POSSIBLE_MSVC_RUNTIMES "msvcr") list(APPEND _Ruby_POSSIBLE_RUNTIMES "msvcr")
endif () endif ()
set(_Ruby_POSSIBLE_VERSION_SUFFICES "${_Ruby_VERSION_NODOT};${_Ruby_VERSION_NODOT_ZERO_PATCH}") set(_Ruby_POSSIBLE_VERSION_SUFFICES "${_Ruby_VERSION_NODOT};${_Ruby_VERSION_NODOT_ZERO_PATCH}")
@@ -404,12 +404,12 @@ if (WIN32)
set(_Ruby_POSSIBLE_ARCH_PREFIXS "lib") set(_Ruby_POSSIBLE_ARCH_PREFIXS "lib")
endif () endif ()
foreach (_Ruby_MSVC_RUNTIME ${_Ruby_POSSIBLE_MSVC_RUNTIMES}) foreach (_Ruby_RUNTIME ${_Ruby_POSSIBLE_RUNTIMES})
foreach (_Ruby_VERSION_SUFFIX ${_Ruby_POSSIBLE_VERSION_SUFFICES}) foreach (_Ruby_VERSION_SUFFIX ${_Ruby_POSSIBLE_VERSION_SUFFICES})
foreach (_Ruby_ARCH_PREFIX ${_Ruby_POSSIBLE_ARCH_PREFIXS}) foreach (_Ruby_ARCH_PREFIX ${_Ruby_POSSIBLE_ARCH_PREFIXS})
list(APPEND _Ruby_POSSIBLE_LIB_NAMES list(APPEND _Ruby_POSSIBLE_LIB_NAMES
"${_Ruby_ARCH_PREFIX}${_Ruby_MSVC_RUNTIME}-ruby${_Ruby_VERSION_SUFFIX}" "${_Ruby_ARCH_PREFIX}${_Ruby_RUNTIME}-ruby${_Ruby_VERSION_SUFFIX}"
"${_Ruby_ARCH_PREFIX}${_Ruby_MSVC_RUNTIME}-ruby${_Ruby_VERSION_SUFFIX}-static") "${_Ruby_ARCH_PREFIX}${_Ruby_RUNTIME}-ruby${_Ruby_VERSION_SUFFIX}-static")
endforeach () endforeach ()
endforeach () endforeach ()
endforeach () endforeach ()