summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-01-14 10:33:52 -0500
committerBrad King <brad.king@kitware.com>2015-01-14 10:33:52 -0500
commit80025e4c3c373f8457e82b38f7af3c2de1857dca (patch)
treee495f45d1fdf0bce7286a829f823248bb2a8add1
parent365973cf98c1455fe4571081a8cb10ce260c4f8f (diff)
parent802d0aa0b0a0af72fdc95bf1f69afeb362b6ef95 (diff)
downloadcmake-80025e4c3c373f8457e82b38f7af3c2de1857dca.tar.gz
Merge branch 'FindRuby-fix-version' into release
-rw-r--r--Modules/FindRuby.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/FindRuby.cmake b/Modules/FindRuby.cmake
index b5ac703cf9..0950d15733 100644
--- a/Modules/FindRuby.cmake
+++ b/Modules/FindRuby.cmake
@@ -90,7 +90,7 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR)
RESULT_VARIABLE _RUBY_SUCCESS
OUTPUT_VARIABLE _RUBY_OUTPUT
ERROR_QUIET)
- if(_RUBY_SUCCESS OR NOT _RUBY_OUTPUT)
+ if(_RUBY_SUCCESS OR _RUBY_OUTPUT STREQUAL "")
execute_process(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['${RBVAR}']"
RESULT_VARIABLE _RUBY_SUCCESS
OUTPUT_VARIABLE _RUBY_OUTPUT