[Cmake-commits] CMake branch, next, updated. v3.1.0-1802-g6de9d59

[Rolf Eike Beer]

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  6de9d59f46094043c358d0cc5aa5a7b532bbecf6 (commit)
       via  dd5d2eb156b7e45ded53f694a12a1e00d19f6cd6 (commit)
      from  f62af7fd49da2d17954013cc9a6c6f6365e0db8c (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=6de9d59f46094043c358d0cc5aa5a7b532bbecf6
commit 6de9d59f46094043c358d0cc5aa5a7b532bbecf6
Merge: f62af7f dd5d2eb
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Jan 12 13:29:50 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 12 13:29:50 2015 -0500

    Merge topic 'FindRuby-zero-version' into next
    
    dd5d2eb1 FindRuby: fix selection of version x.0 (#15345)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dd5d2eb156b7e45ded53f694a12a1e00d19f6cd6
commit dd5d2eb156b7e45ded53f694a12a1e00d19f6cd6
Author:     David Coppa <dcoppa at gmail.com>
AuthorDate: Mon Jan 12 19:28:02 2015 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Mon Jan 12 19:28:02 2015 +0100

    FindRuby: fix selection of version x.0 (#15345)
    
    When "Ruby_FIND_VERSION_MINOR" is 0, the "if(Ruby_FIND_VERSION_MAJOR AND
    Ruby_FIND_VERSION_MINOR)" check evaluated to false.

diff --git a/Modules/FindRuby.cmake b/Modules/FindRuby.cmake
index b5ac703..61858aa 100644
--- a/Modules/FindRuby.cmake
+++ b/Modules/FindRuby.cmake
@@ -58,7 +58,7 @@
 set(_RUBY_POSSIBLE_EXECUTABLE_NAMES ruby)
 
 # if 1.9 is required, don't look for ruby18 and ruby1.8, default to version 1.8
-if(Ruby_FIND_VERSION_MAJOR  AND  Ruby_FIND_VERSION_MINOR)
+if(DEFINED Ruby_FIND_VERSION_MAJOR AND DEFINED Ruby_FIND_VERSION_MINOR)
    set(Ruby_FIND_VERSION_SHORT_NODOT "${Ruby_FIND_VERSION_MAJOR}${RUBY_FIND_VERSION_MINOR}")
    # we can't construct that if only major version is given
    set(_RUBY_POSSIBLE_EXECUTABLE_NAMES

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

Summary of changes:
 Modules/FindRuby.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake