You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
21 lines
995 B
21 lines
995 B
7 years ago
|
diff -Nrup a/Modules/FindRuby.cmake b/Modules/FindRuby.cmake
|
||
|
|
--- a/Modules/FindRuby.cmake 2014-01-16 12:15:08.000000000 -0500
|
||
|
|
+++ b/Modules/FindRuby.cmake 2016-03-02 16:10:18.242811297 -0500
|
||
|
|
@@ -101,14 +101,8 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSIO
|
||
|
|
_RUBY_CONFIG_VAR("sitearchdir" RUBY_SITEARCH_DIR)
|
||
|
|
_RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR)
|
||
|
|
|
||
|
|
- # vendor_ruby available ?
|
||
|
|
- execute_process(COMMAND ${RUBY_EXECUTABLE} -r vendor-specific -e "print 'true'"
|
||
|
|
- OUTPUT_VARIABLE RUBY_HAS_VENDOR_RUBY ERROR_QUIET)
|
||
|
|
-
|
||
|
|
- if(RUBY_HAS_VENDOR_RUBY)
|
||
|
|
- _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)
|
||
|
|
|
||
|
|
# 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)
|