[Cmake-commits] CMake branch, next, updated. v3.1.2-1165-g5b19ac5

Brad King brad.king at kitware.com
Tue Feb 10 09:56:13 EST 2015


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  5b19ac52bb4db11dd932c2f522cdda25a19a2ba3 (commit)
       via  e5ef9271a1bb1a0779132beba4cf2b0bae13d6cc (commit)
      from  f69ce957afe5631e73f2130c725474e651813623 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5b19ac52bb4db11dd932c2f522cdda25a19a2ba3
commit 5b19ac52bb4db11dd932c2f522cdda25a19a2ba3
Merge: f69ce95 e5ef927
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 10 09:56:12 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 10 09:56:12 2015 -0500

    Merge topic 'FindRuby-windows-x64' into next
    
    e5ef9271 FindRuby: Fix finding 64-bit Ruby on Windows


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e5ef9271a1bb1a0779132beba4cf2b0bae13d6cc
commit e5ef9271a1bb1a0779132beba4cf2b0bae13d6cc
Author:     Michael Smith <michael.smith at puppetlabs.com>
AuthorDate: Fri Feb 6 12:21:51 2015 -0800
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 10 09:54:21 2015 -0500

    FindRuby: Fix finding 64-bit Ruby on Windows
    
    Ruby 2.0.0 and 2.1.5 have 64-bit binaries for Windows, with "x64-"
    prefix.

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} )

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindRuby.cmake |   13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list