diff options
| author | Brad King <brad.king@kitware.com> | 2015-02-11 14:59:22 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-02-11 14:59:22 (GMT) |
| commit | dcc5de9c4b7dbc17229d9f11aee978f6828d932d (patch) | |
| tree | e30160ded2bdd072693619acded2dd511eddb22b | |
| parent | 0e6af852637ada6b2343f1cbf1ac5ccf0b1b3c76 (diff) | |
| parent | e5ef9271a1bb1a0779132beba4cf2b0bae13d6cc (diff) | |
| download | CMake-dcc5de9c4b7dbc17229d9f11aee978f6828d932d.zip CMake-dcc5de9c4b7dbc17229d9f11aee978f6828d932d.tar.gz CMake-dcc5de9c4b7dbc17229d9f11aee978f6828d932d.tar.bz2 | |
Merge topic 'FindRuby-windows-x64'
e5ef9271 FindRuby: Fix finding 64-bit Ruby on Windows
| -rw-r--r-- | Modules/FindRuby.cmake | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/Modules/FindRuby.cmake b/Modules/FindRuby.cmake index 4be16c9..e5ea210 100644 --- a/Modules/FindRuby.cmake +++ b/Modules/FindRuby.cmake @@ -234,11 +234,16 @@ if(WIN32) set( _RUBY_MSVC_RUNTIME "90" ) endif() + set(_RUBY_ARCH_PREFIX "") + if(CMAKE_SIZEOF_VOID_P EQUAL 8) + set(_RUBY_ARCH_PREFIX "x64-") + endif() + list(APPEND _RUBY_POSSIBLE_LIB_NAMES - "msvcr${_RUBY_MSVC_RUNTIME}-ruby${_RUBY_NODOT_VERSION}" - "msvcr${_RUBY_MSVC_RUNTIME}-ruby${_RUBY_NODOT_VERSION}-static" - "msvcrt-ruby${_RUBY_NODOT_VERSION}" - "msvcrt-ruby${_RUBY_NODOT_VERSION}-static" ) + "${_RUBY_ARCH_PREFIX}msvcr${_RUBY_MSVC_RUNTIME}-ruby${_RUBY_NODOT_VERSION}" + "${_RUBY_ARCH_PREFIX}msvcr${_RUBY_MSVC_RUNTIME}-ruby${_RUBY_NODOT_VERSION}-static" + "${_RUBY_ARCH_PREFIX}msvcrt-ruby${_RUBY_NODOT_VERSION}" + "${_RUBY_ARCH_PREFIX}msvcrt-ruby${_RUBY_NODOT_VERSION}-static" ) endif() find_library(RUBY_LIBRARY NAMES ${_RUBY_POSSIBLE_LIB_NAMES} HINTS ${RUBY_POSSIBLE_LIB_DIR} ) |