diff options
| author | Brad King <brad.king@kitware.com> | 2015-01-14 15:33:52 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-01-14 15:33:52 (GMT) |
| commit | 80025e4c3c373f8457e82b38f7af3c2de1857dca (patch) | |
| tree | e495f45d1fdf0bce7286a829f823248bb2a8add1 | |
| parent | 365973cf98c1455fe4571081a8cb10ce260c4f8f (diff) | |
| parent | 802d0aa0b0a0af72fdc95bf1f69afeb362b6ef95 (diff) | |
| download | CMake-80025e4c3c373f8457e82b38f7af3c2de1857dca.zip CMake-80025e4c3c373f8457e82b38f7af3c2de1857dca.tar.gz CMake-80025e4c3c373f8457e82b38f7af3c2de1857dca.tar.bz2 | |
Merge branch 'FindRuby-fix-version' into release
| -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..0950d15 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 |