ngompa / rpms / cmake

Forked from rpms/cmake 3 years ago
Clone
f58644
Index: cmake-3.17.0-rc1/Modules/FindRuby.cmake
f58644
===================================================================
f58644
--- cmake-3.17.0-rc1.orig/Modules/FindRuby.cmake
f58644
+++ cmake-3.17.0-rc1/Modules/FindRuby.cmake
f58644
@@ -110,14 +110,8 @@ if(RUBY_EXECUTABLE  AND NOT  RUBY_VERSIO
f58644
   _RUBY_CONFIG_VAR("sitearchdir" RUBY_SITEARCH_DIR)
f58644
   _RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR)
f58644
 
f58644
-  # vendor_ruby available ?
f58644
-  execute_process(COMMAND ${RUBY_EXECUTABLE} -r vendor-specific -e "print 'true'"
f58644
-    OUTPUT_VARIABLE RUBY_HAS_VENDOR_RUBY  ERROR_QUIET)
f58644
-
f58644
-  if(RUBY_HAS_VENDOR_RUBY)
f58644
-    _RUBY_CONFIG_VAR("vendorlibdir" RUBY_VENDORLIB_DIR)
f58644
-    _RUBY_CONFIG_VAR("vendorarchdir" RUBY_VENDORARCH_DIR)
f58644
-  endif()
f58644
+  _RUBY_CONFIG_VAR("vendorlibdir" RUBY_VENDORLIB_DIR)
f58644
+  _RUBY_CONFIG_VAR("vendorarchdir" RUBY_VENDORARCH_DIR)
f58644
 
f58644
   # save the results in the cache so we don't have to run ruby the next time again
f58644
   set(RUBY_VERSION_MAJOR    ${RUBY_VERSION_MAJOR}    CACHE PATH "The Ruby major version" FORCE)