From 76029bd3a3fb084bfd62ceb241d9c5a32578dea6 Mon Sep 17 00:00:00 2001 From: CoprDistGit Date: Fri, 1 Nov 2024 14:05:52 +0000 Subject: automatic import of cmake --- cmake-findruby.patch | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) mode change 100755 => 100644 cmake-findruby.patch (limited to 'cmake-findruby.patch') diff --git a/cmake-findruby.patch b/cmake-findruby.patch old mode 100755 new mode 100644 index 97ac43a..72a8b25 --- a/cmake-findruby.patch +++ b/cmake-findruby.patch @@ -1,7 +1,8 @@ -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 @@ +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_ _RUBY_CONFIG_VAR("sitearchdir" Ruby_SITEARCH_DIR) _RUBY_CONFIG_VAR("sitelibdir" Ruby_SITELIB_DIR) @@ -13,8 +14,9 @@ diff -Naur cmake-3.18.2.orig/Modules/FindRuby.cmake cmake-3.18.2/Modules/FindRub - _RUBY_CONFIG_VAR("vendorlibdir" Ruby_VENDORLIB_DIR) - _RUBY_CONFIG_VAR("vendorarchdir" Ruby_VENDORARCH_DIR) - endif() -+ _RUBY_CONFIG_VAR("vendorlibdir" RUBY_VENDORLIB_DIR) -+ _RUBY_CONFIG_VAR("vendorarchdir" RUBY_VENDORARCH_DIR) ++ # vendor_ruby ++ _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) -- cgit v1.2.3