testing/cmake
SHA256
3
0
Fork 0
forked from pool/cmake
Code Pull Requests Activity
39436d065c
cmake/cmake-fix-ruby-test.patch

14 lines
690 B
Diff
Raw Normal View History

Accepting request 120949 from home:coolo:branches:openSUSE:Factory - vendor-specific does no longer exist with ruby 1.9, so don't use it to check vendor support OBS-URL: https://build.opensuse.org/request/show/120949 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=89
2012-05-14 16:31:24 +02:00
Index: cmake-2.8.8/Modules/FindRuby.cmake
===================================================================
--- cmake-2.8.8.orig/Modules/FindRuby.cmake 2012-04-18 20:10:54.000000000 +0200
+++ cmake-2.8.8/Modules/FindRuby.cmake 2012-05-14 15:42:52.137253084 +0200
@@ -93,7 +93,7 @@ IF(RUBY_EXECUTABLE AND NOT RUBY_VERSIO
_RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR)
# vendor_ruby available ?
- EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r vendor-specific -e "print 'true'"
use .nil? instead of .blank?, thanks to darix for pointing it out OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=91
2012-05-15 13:17:41 +02:00
+ EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -e "print 'true' unless Config::CONFIG['vendorarchdir'].nil?"
Accepting request 120949 from home:coolo:branches:openSUSE:Factory - vendor-specific does no longer exist with ruby 1.9, so don't use it to check vendor support OBS-URL: https://build.opensuse.org/request/show/120949 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=89
2012-05-14 16:31:24 +02:00
OUTPUT_VARIABLE RUBY_HAS_VENDOR_RUBY ERROR_QUIET)
IF(RUBY_HAS_VENDOR_RUBY)
Copy Permalink