forked from pool/cmake
Simon Lees
c597f4bab8
- Update to 3.23.3:
* This version made no changes to documented features or interfaces.
Some implementation updates were made to support ecosystem changes
and/or fix regressions.
- Rebase cmake-fix-ruby-test.patch
- Rebase cmake-fix-png-include-dir.patch
OBS-URL: https://build.opensuse.org/request/show/992207
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=496
14 lines
630 B
Diff
14 lines
630 B
Diff
Index: cmake-3.23.3/Modules/FindRuby.cmake
|
|
===================================================================
|
|
--- cmake-3.23.3.orig/Modules/FindRuby.cmake
|
|
+++ cmake-3.23.3/Modules/FindRuby.cmake
|
|
@@ -316,7 +316,7 @@ if(Ruby_EXECUTABLE AND NOT Ruby_VERSION_
|
|
_RUBY_CONFIG_VAR("sitelibdir" Ruby_SITELIB_DIR)
|
|
|
|
# vendor_ruby available ?
|
|
- execute_process(COMMAND ${Ruby_EXECUTABLE} -r vendor-specific -e "print 'true'"
|
|
+ execute_process(COMMAND ${Ruby_EXECUTABLE} -r rbconfig -e "print 'true' unless RbConfig::CONFIG['vendorarchdir'].nil?"
|
|
OUTPUT_VARIABLE Ruby_HAS_VENDOR_RUBY ERROR_QUIET)
|
|
|
|
if(Ruby_HAS_VENDOR_RUBY)
|