summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-01-15 14:53:52 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-01-15 14:53:52 (GMT)
commit1720869a7e287786e5d4f5c85d07bf418dd81782 (patch)
treea48591ea63e0739ea5524e35e3bf09d09be9b06f
parent49bfaf2bda8368cb8398313bed8f91e3aa8ada14 (diff)
parent802d0aa0b0a0af72fdc95bf1f69afeb362b6ef95 (diff)
downloadCMake-1720869a7e287786e5d4f5c85d07bf418dd81782.zip
CMake-1720869a7e287786e5d4f5c85d07bf418dd81782.tar.gz
CMake-1720869a7e287786e5d4f5c85d07bf418dd81782.tar.bz2
Merge topic 'FindRuby-fix-version'
802d0aa0 FindRuby: Fix output check in _RUBY_CONFIG_VAR
-rw-r--r--Modules/FindRuby.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/FindRuby.cmake b/Modules/FindRuby.cmake
index 61858aa..4be16c9 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