- updated to 3.15.2

[packages/cmake.git] / cmake-findruby.patch

diff --git a/cmake-findruby.patch b/cmake-findruby.patch
index fe3782da59ed7aaeeca9c75ac569b21e8d97a0b9..d4451bfa4d0226ed94718a6a3b01cb1285c1d506 100644 (file)
--- a/cmake-findruby.patch
+++ b/cmake-findruby.patch
@@ -13,20 +13,20 @@ Date:   Mon May 21 10:39:01 2012 -0600
 diff -up cmake-2.8.10-rc1/Modules/FindRuby.cmake.findruby cmake-2.8.10-rc1/Modules/FindRuby.cmake
 --- cmake-2.8.10-rc1/Modules/FindRuby.cmake.findruby   2012-10-02 10:12:18.000000000 -0600
 +++ cmake-2.8.10-rc1/Modules/FindRuby.cmake    2012-10-02 15:50:30.463292214 -0600
-@@ -92,14 +92,8 @@ if(RUBY_EXECUTABLE  AND NOT  RUBY_VERSIO
-    _RUBY_CONFIG_VAR("sitearchdir" RUBY_SITEARCH_DIR)
-    _RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR)
+@@ -110,14 +110,8 @@
+   _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)
+-  # 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)
+-  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)
+   # 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)