kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: make FindRuby work with the libs for MSVC, which can have additional 

pre- and suffixes (#5642)

Alex
This commit is contained in:
Alexander Neundorf 2008-01-02 11:43:28 -05:00
parent ff04863d9d
commit 8e644c9dfa
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Modules/FindRuby.cmake
View File

@ -21,7 +21,7 @@ endif (RUBY_LIBRARY AND RUBY_INCLUDE_PATH)
# RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"libdir"@:>@)'` # RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"libdir"@:>@)'`
# RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'` # RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'`
FIND_PROGRAM(RUBY_EXECUTABLE NAMES ruby ruby1.8 ruby18 ) FIND_PROGRAM(RUBY_EXECUTABLE NAMES ruby ruby1.8 ruby18 ruby1.9 ruby19)
EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['archdir']" EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['archdir']"
OUTPUT_VARIABLE RUBY_ARCH_DIR) OUTPUT_VARIABLE RUBY_ARCH_DIR)
@ -45,8 +45,10 @@ FIND_PATH(RUBY_INCLUDE_PATH
${RUBY_ARCH_DIR} ${RUBY_ARCH_DIR}
/usr/lib/ruby/1.8/i586-linux-gnu/ ) /usr/lib/ruby/1.8/i586-linux-gnu/ )
# search the ruby library, the version for MSVC can have the "msvc" prefix and the "static" suffix
FIND_LIBRARY(RUBY_LIBRARY FIND_LIBRARY(RUBY_LIBRARY
NAMES ruby ruby1.8 NAMES ruby ruby1.8 ruby1.9
msvcrt-ruby18 msvcrt-ruby19 msvcrt-ruby18-static msvcrt-ruby19-static
PATHS ${RUBY_POSSIBLE_LIB_PATH} PATHS ${RUBY_POSSIBLE_LIB_PATH}
) )