Merge topic 'FindRuby-fix-version'
802d0aa0
FindRuby: Fix output check in _RUBY_CONFIG_VAR
This commit is contained in:
commit
1720869a7e
|
@ -90,7 +90,7 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR)
|
||||||
RESULT_VARIABLE _RUBY_SUCCESS
|
RESULT_VARIABLE _RUBY_SUCCESS
|
||||||
OUTPUT_VARIABLE _RUBY_OUTPUT
|
OUTPUT_VARIABLE _RUBY_OUTPUT
|
||||||
ERROR_QUIET)
|
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}']"
|
execute_process(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['${RBVAR}']"
|
||||||
RESULT_VARIABLE _RUBY_SUCCESS
|
RESULT_VARIABLE _RUBY_SUCCESS
|
||||||
OUTPUT_VARIABLE _RUBY_OUTPUT
|
OUTPUT_VARIABLE _RUBY_OUTPUT
|
||||||
|
|
Loading…
Reference in New Issue