cmake/cmake-findruby.patch

23 lines
1013 B
Diff
Raw Normal View History

2020-06-12 16:12:36 +00:00
Index: cmake-3.18.0-rc1/Modules/FindRuby.cmake
2020-02-17 22:02:11 +00:00
===================================================================
2020-06-12 16:12:36 +00:00
--- cmake-3.18.0-rc1.orig/Modules/FindRuby.cmake
+++ cmake-3.18.0-rc1/Modules/FindRuby.cmake
@@ -289,14 +289,9 @@ if(Ruby_EXECUTABLE AND NOT Ruby_VERSION_
_RUBY_CONFIG_VAR("sitearchdir" Ruby_SITEARCH_DIR)
_RUBY_CONFIG_VAR("sitelibdir" Ruby_SITELIB_DIR)
2012-05-21 16:39:01 +00:00
2019-10-02 02:27:06 +00:00
- # vendor_ruby available ?
2020-06-12 16:12:36 +00:00
- execute_process(COMMAND ${Ruby_EXECUTABLE} -r vendor-specific -e "print 'true'"
- OUTPUT_VARIABLE Ruby_HAS_VENDOR_RUBY ERROR_QUIET)
2012-05-21 16:39:01 +00:00
-
2020-06-12 16:12:36 +00:00
- if(Ruby_HAS_VENDOR_RUBY)
- _RUBY_CONFIG_VAR("vendorlibdir" Ruby_VENDORLIB_DIR)
- _RUBY_CONFIG_VAR("vendorarchdir" Ruby_VENDORARCH_DIR)
2019-10-02 02:27:06 +00:00
- endif()
2020-06-12 16:12:36 +00:00
+ # vendor_ruby
+ _RUBY_CONFIG_VAR("vendorlibdir" Ruby_VENDORLIB_DIR)
+ _RUBY_CONFIG_VAR("vendorarchdir" Ruby_VENDORARCH_DIR)
2012-05-21 16:39:01 +00:00
2019-10-02 02:27:06 +00:00
# save the results in the cache so we don't have to run ruby the next time again
2020-06-12 16:12:36 +00:00
set(Ruby_VERSION_MAJOR ${Ruby_VERSION_MAJOR} CACHE PATH "The Ruby major version" FORCE)