diff options
author | Brad King <brad.king@kitware.com> | 2015-01-14 15:33:58 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2015-01-14 15:33:58 (GMT) |
commit | 86d6ab06edfc000a7d6a405726887562e6e2f338 (patch) | |
tree | 033a934dde5ae6039325a2c99177712783133789 /Modules | |
parent | 80025e4c3c373f8457e82b38f7af3c2de1857dca (diff) | |
parent | dd5d2eb156b7e45ded53f694a12a1e00d19f6cd6 (diff) | |
download | CMake-86d6ab06edfc000a7d6a405726887562e6e2f338.zip CMake-86d6ab06edfc000a7d6a405726887562e6e2f338.tar.gz CMake-86d6ab06edfc000a7d6a405726887562e6e2f338.tar.bz2 |
Merge branch 'FindRuby-zero-version' into release
Diffstat (limited to 'Modules')
-rw-r--r-- | Modules/FindRuby.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/FindRuby.cmake b/Modules/FindRuby.cmake index 0950d15..4be16c9 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 |