summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog.adoc1
-rw-r--r--cmake/FindRuby.cmake2
2 files changed, 2 insertions, 1 deletions
diff --git a/ChangeLog.adoc b/ChangeLog.adoc
index 64d1baddd..0ae88b6fe 100644
--- a/ChangeLog.adoc
+++ b/ChangeLog.adoc
@@ -71,6 +71,7 @@ Tests::
Build::
* core: make libintl.h required if CMake option ENABLE_NLS is enabled (issue #2031)
+ * ruby: add detection of Ruby 3.3
[[v4.1.2]]
== Version 4.1.2 (2023-12-03)
diff --git a/cmake/FindRuby.cmake b/cmake/FindRuby.cmake
index 51041e127..0751b886c 100644
--- a/cmake/FindRuby.cmake
+++ b/cmake/FindRuby.cmake
@@ -37,7 +37,7 @@ if(PKG_CONFIG_FOUND)
# set specific search path for macOS
set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:/usr/local/opt/ruby/lib/pkgconfig")
endif()
- pkg_search_module(RUBY ruby-3.2 ruby-3.1 ruby-3.0 ruby-2.7 ruby-2.6 ruby-2.5 ruby-2.4 ruby-2.3 ruby-2.2 ruby-2.1 ruby-2.0 ruby-1.9 ruby)
+ pkg_search_module(RUBY ruby-3.3 ruby-3.2 ruby-3.1 ruby-3.0 ruby-2.7 ruby-2.6 ruby-2.5 ruby-2.4 ruby-2.3 ruby-2.2 ruby-2.1 ruby-2.0 ruby-1.9 ruby)
if(RUBY_FOUND AND ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
# FIXME: weird hack: hardcoding the Ruby lib location on macOS
set(RUBY_LDFLAGS "${RUBY_LDFLAGS} -L/usr/local/opt/ruby/lib")