diff options
Diffstat (limited to 'cmake-findruby.patch')
-rwxr-xr-x[-rw-r--r--] | cmake-findruby.patch | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/cmake-findruby.patch b/cmake-findruby.patch index 72a8b25..97ac43a 100644..100755 --- a/cmake-findruby.patch +++ b/cmake-findruby.patch @@ -1,8 +1,7 @@ -Index: cmake-3.23.0-rc2/Modules/FindRuby.cmake -=================================================================== ---- cmake-3.23.0-rc2.orig/Modules/FindRuby.cmake -+++ cmake-3.23.0-rc2/Modules/FindRuby.cmake -@@ -315,14 +315,9 @@ if(Ruby_EXECUTABLE AND NOT Ruby_VERSION_ +diff -Naur cmake-3.18.2.orig/Modules/FindRuby.cmake cmake-3.18.2/Modules/FindRuby.cmake +--- cmake-3.18.2.orig/Modules/FindRuby.cmake 2020-09-08 13:30:51.129086854 +0000 ++++ cmake-3.18.2/Modules/FindRuby.cmake 2020-09-10 07:10:56.679302608 +0000 +@@ -300,14 +300,8 @@ _RUBY_CONFIG_VAR("sitearchdir" Ruby_SITEARCH_DIR) _RUBY_CONFIG_VAR("sitelibdir" Ruby_SITELIB_DIR) @@ -14,9 +13,8 @@ Index: cmake-3.23.0-rc2/Modules/FindRuby.cmake - _RUBY_CONFIG_VAR("vendorlibdir" Ruby_VENDORLIB_DIR) - _RUBY_CONFIG_VAR("vendorarchdir" Ruby_VENDORARCH_DIR) - endif() -+ # vendor_ruby -+ _RUBY_CONFIG_VAR("vendorlibdir" Ruby_VENDORLIB_DIR) -+ _RUBY_CONFIG_VAR("vendorarchdir" Ruby_VENDORARCH_DIR) ++ _RUBY_CONFIG_VAR("vendorlibdir" RUBY_VENDORLIB_DIR) ++ _RUBY_CONFIG_VAR("vendorarchdir" RUBY_VENDORARCH_DIR) # save the results in the cache so we don't have to run ruby the next time again set(Ruby_VERSION_MAJOR ${Ruby_VERSION_MAJOR} CACHE PATH "The Ruby major version" FORCE) |