From ffa08d256fa0aaa52afcb05b50f4d4a485d84171 Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 13 Mar 2020 14:13:17 -0400 Subject: FindRuby: Fix compatibility with upper-case cache variables In commit e672db628b (FindRuby: Rename variables to match case of module name, 2020-03-11) compatibility was provided for result variables but not for the cache entries that scripts might set. --- Modules/FindRuby.cmake | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/Modules/FindRuby.cmake b/Modules/FindRuby.cmake index 87637be..5df242b 100644 --- a/Modules/FindRuby.cmake +++ b/Modules/FindRuby.cmake @@ -34,6 +34,22 @@ Also: same as Ruby_INCLUDE_DIRS, only provided for compatibility reasons, don't use it #]=======================================================================] +# Backwards compatibility +# Define camel case versions of input variables +foreach(UPPER + RUBY_EXECUTABLE + RUBY_LIBRARY + RUBY_INCLUDE_DIR + RUBY_CONFIG_INCLUDE_DIR + ) + if (DEFINED ${UPPER}) + string(REPLACE "RUBY_" "Ruby_" Camel ${UPPER}) + if (NOT DEFINED ${Camel}) + set(${Camel} ${${UPPER}}) + endif() + endif() +endforeach() + # Ruby_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'` # Ruby_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'` # Ruby_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'` -- cgit v0.12