From dd5d2eb156b7e45ded53f694a12a1e00d19f6cd6 Mon Sep 17 00:00:00 2001 From: David Coppa Date: Mon, 12 Jan 2015 19:28:02 +0100 Subject: 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. --- Modules/FindRuby.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Modules/FindRuby.cmake') diff --git a/Modules/FindRuby.cmake b/Modules/FindRuby.cmake index b5ac703cf9..61858aa215 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 -- cgit v1.2.1