21 lines
1.0 KiB
Diff
21 lines
1.0 KiB
Diff
diff -up cmake-3.7.0-rc1/Modules/FindRuby.cmake.orig cmake-3.7.0-rc1/Modules/FindRuby.cmake
|
|
--- cmake-3.7.0-rc1/Modules/FindRuby.cmake.orig 2016-10-04 07:54:11.000000000 -0600
|
|
+++ cmake-3.7.0-rc1/Modules/FindRuby.cmake 2016-10-06 15:23:57.195332679 -0600
|
|
@@ -106,14 +106,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)
|