diff options
author | Brad King <brad.king@kitware.com> | 2015-01-15 14:53:49 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-01-15 14:53:49 (GMT) |
commit | 49bfaf2bda8368cb8398313bed8f91e3aa8ada14 (patch) | |
tree | afcf4c02b622d6e1e100c4101a42865880a555c3 /Modules/FindRuby.cmake | |
parent | 101a62aacbcc812263439ca42faaf4f2419b6119 (diff) | |
parent | dd5d2eb156b7e45ded53f694a12a1e00d19f6cd6 (diff) | |
download | CMake-49bfaf2bda8368cb8398313bed8f91e3aa8ada14.zip CMake-49bfaf2bda8368cb8398313bed8f91e3aa8ada14.tar.gz CMake-49bfaf2bda8368cb8398313bed8f91e3aa8ada14.tar.bz2 |
Merge topic 'FindRuby-zero-version'
dd5d2eb1 FindRuby: fix selection of version x.0 (#15345)
Diffstat (limited to 'Modules/FindRuby.cmake')
-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 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 |