[Cmake-commits] CMake branch, next, updated. v2.8.6-1573-gb6440da

[Alexander Neundorf]

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  b6440da5b53aa0ac837bd521be45163c1d72f347 (commit)
       via  d2b1ce6af0fbdaf75e07cdb102839e9eaf49c1b9 (commit)
       via  ba5a8bcf5d8c8350c195b4c197d57576bbd27e99 (commit)
      from  49c1cf5cd65752a6a28591b9dd9f4b6a0ab220e8 (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=b6440da5b53aa0ac837bd521be45163c1d72f347
commit b6440da5b53aa0ac837bd521be45163c1d72f347
Merge: 49c1cf5 d2b1ce6
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Wed Oct 12 17:09:11 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 12 17:09:11 2011 -0400

    Merge topic 'FindRubyOnOpenBSD' into next
    
    d2b1ce6 Find Ruby on OpenBSD when installed from ports (#12507)
    ba5a8bc Remove trailing whitespace


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d2b1ce6af0fbdaf75e07cdb102839e9eaf49c1b9
commit d2b1ce6af0fbdaf75e07cdb102839e9eaf49c1b9
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Wed Oct 12 23:05:52 2011 +0200
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Wed Oct 12 23:05:52 2011 +0200

    Find Ruby on OpenBSD when installed from ports (#12507)
    
    The ruby library on OpenBSD is named rubyXY, not ruby X.y.
    Find that too.
    
    Alex

diff --git a/Modules/FindRuby.cmake b/Modules/FindRuby.cmake
index 0c86b2d..ae2ea2e 100644
--- a/Modules/FindRuby.cmake
+++ b/Modules/FindRuby.cmake
@@ -180,7 +180,7 @@ ENDIF( ${Ruby_FIND_VERSION_SHORT_NODOT} GREATER 18  OR  ${_RUBY_VERSION_SHORT_NO
 
 
 # Determine the list of possible names for the ruby library
-SET(_RUBY_POSSIBLE_LIB_NAMES ruby ruby-static ruby${_RUBY_VERSION_SHORT})
+SET(_RUBY_POSSIBLE_LIB_NAMES ruby ruby-static ruby${_RUBY_VERSION_SHORT} ruby${_RUBY_VERSION_SHORT_NODOT})
 
 IF(WIN32)
    SET( _RUBY_MSVC_RUNTIME "" )

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ba5a8bcf5d8c8350c195b4c197d57576bbd27e99
commit ba5a8bcf5d8c8350c195b4c197d57576bbd27e99
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Wed Oct 12 23:05:30 2011 +0200
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Wed Oct 12 23:05:30 2011 +0200

    Remove trailing whitespace
    
    Alex

diff --git a/Modules/FindRuby.cmake b/Modules/FindRuby.cmake
index 80fb216..0c86b2d 100644
--- a/Modules/FindRuby.cmake
+++ b/Modules/FindRuby.cmake
@@ -137,7 +137,7 @@ IF(RUBY_EXECUTABLE  AND NOT  RUBY_MAJOR_VERSION)
      )
 ENDIF(RUBY_EXECUTABLE  AND NOT  RUBY_MAJOR_VERSION)
 
-# In case RUBY_EXECUTABLE could not be executed (e.g. cross compiling) 
+# In case RUBY_EXECUTABLE could not be executed (e.g. cross compiling)
 # try to detect which version we found. This is not too good.
 IF(NOT RUBY_VERSION_MAJOR)
    # by default assume 1.8.0
@@ -170,9 +170,9 @@ SET(RUBY_INCLUDE_DIRS ${RUBY_INCLUDE_DIR} )
 IF( ${Ruby_FIND_VERSION_SHORT_NODOT} GREATER 18  OR  ${_RUBY_VERSION_SHORT_NODOT} GREATER 18  OR  RUBY_HDR_DIR)
    FIND_PATH(RUBY_CONFIG_INCLUDE_DIR
      NAMES ruby/config.h  config.h
-     HINTS 
+     HINTS
      ${RUBY_HDR_DIR}/${RUBY_ARCH}
-     ${RUBY_ARCH_DIR} 
+     ${RUBY_ARCH_DIR}
      )
 
    SET(RUBY_INCLUDE_DIRS ${RUBY_INCLUDE_DIRS} ${RUBY_CONFIG_INCLUDE_DIR} )
@@ -202,7 +202,7 @@ IF(WIN32)
 
    LIST(APPEND _RUBY_POSSIBLE_LIB_NAMES
                "msvcr${_RUBY_MSVC_RUNTIME}-ruby${_RUBY_NODOT_VERSION}"
-               "msvcr${_RUBY_MSVC_RUNTIME}-ruby${_RUBY_NODOT_VERSION}-static" 
+               "msvcr${_RUBY_MSVC_RUNTIME}-ruby${_RUBY_NODOT_VERSION}-static"
                "msvcrt-ruby${_RUBY_NODOT_VERSION}"
                "msvcrt-ruby${_RUBY_NODOT_VERSION}-static" )
 ENDIF(WIN32)

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

Summary of changes:
 Modules/FindRuby.cmake |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake