diff options
| author | Brad King <brad.king@kitware.com> | 2021-03-26 13:23:40 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-03-26 13:24:19 (GMT) |
| commit | 03f2aad7b1af478a5afea06a59c5ef119c4761d8 (patch) | |
| tree | 12468c59e408f5cbe769edca77e12007c0d19d50 | |
| parent | 021d0113b94c9e9122bf72b7d201a76146b06c5c (diff) | |
| parent | 238c2b6cb7e96a6024108b3657f7d8bec6fa07f2 (diff) | |
| download | CMake-03f2aad7b1af478a5afea06a59c5ef119c4761d8.zip CMake-03f2aad7b1af478a5afea06a59c5ef119c4761d8.tar.gz CMake-03f2aad7b1af478a5afea06a59c5ef119c4761d8.tar.bz2 | |
Merge topic 'FindRuby-nodot-version'
238c2b6cb7 FindRuby: Consider ruby names with full nodot version suffixes
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5942
| -rw-r--r-- | Modules/FindRuby.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/FindRuby.cmake b/Modules/FindRuby.cmake index ee07f83..759f57c 100644 --- a/Modules/FindRuby.cmake +++ b/Modules/FindRuby.cmake @@ -435,7 +435,7 @@ endif() # Determine the list of possible names for the ruby library -set(_Ruby_POSSIBLE_LIB_NAMES ruby ruby-static ruby${_Ruby_VERSION_SHORT} ruby${_Ruby_VERSION_SHORT_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_NODOT_VERSION} ruby-${_Ruby_VERSION_SHORT} ruby-${Ruby_VERSION}) if(WIN32) set(_Ruby_POSSIBLE_MSVC_RUNTIMES "msvcrt;vcruntime140;vcruntime140_1") |