21 lines
919 B
Diff
21 lines
919 B
Diff
--- origsrc/cmake-2.8.9/Modules/FindRuby.cmake 2012-08-09 13:15:19.000000000 -0500
|
|
+++ src/cmake-2.8.9/Modules/FindRuby.cmake 2012-08-23 01:36:44.554852600 -0500
|
|
@@ -88,6 +88,8 @@ IF(RUBY_EXECUTABLE AND NOT RUBY_VERSIO
|
|
_RUBY_CONFIG_VAR("libdir" RUBY_POSSIBLE_LIB_DIR)
|
|
_RUBY_CONFIG_VAR("rubylibdir" RUBY_RUBY_LIB_DIR)
|
|
|
|
+ _RUBY_CONFIG_VAR("RUBY_SO_NAME" RUBY_SO_NAME)
|
|
+
|
|
# site_ruby
|
|
_RUBY_CONFIG_VAR("sitearchdir" RUBY_SITEARCH_DIR)
|
|
_RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR)
|
|
@@ -176,7 +178,7 @@ ENDIF( "${Ruby_FIND_VERSION_SHORT_NODOT}
|
|
|
|
|
|
# Determine the list of possible names for the ruby library
|
|
-set(_RUBY_POSSIBLE_LIB_NAMES ruby ruby-static ruby${_RUBY_VERSION_SHORT} ruby${_RUBY_VERSION_SHORT_NODOT} ruby-${_RUBY_VERSION_SHORT} ruby-${RUBY_VERSION})
|
|
+set(_RUBY_POSSIBLE_LIB_NAMES ${RUBY_SO_NAME} ${RUBY_SO_NAME}-static ruby ruby-static)
|
|
|
|
if(WIN32)
|
|
set( _RUBY_MSVC_RUNTIME "" )
|