forked from pool/cmake
Dirk Mueller
9dc6932a6b
- update to 3.30.3:
* file(DOWNLOAD): Fix User-Agent to use run-time curl version
* curl: Avoid using HTTP/2 with curl 8.7.x due to bug in error
codes
* FindPython: fix regression of NumPy detection with Intel MKL
library
* FindPython: ensure a usable environment is set for the free
threaded Python
* project: non cache <project> prefix variables are created
* FindJNI: Support finding libjvm.so for all OpenJDK variants
- Remove cmake-zerojvm.patch which is part of upstream
OBS-URL: https://build.opensuse.org/request/show/1197687
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=602
14 lines
630 B
Diff
14 lines
630 B
Diff
Index: cmake-3.26.2/Modules/FindRuby.cmake
|
|
===================================================================
|
|
--- cmake-3.26.2.orig/Modules/FindRuby.cmake
|
|
+++ cmake-3.26.2/Modules/FindRuby.cmake
|
|
@@ -313,7 +313,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)
|