[Cmake-commits] [cmake-commits] alex committed FindRuby.cmake 1.9 1.10

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv6606

Modified Files:
	FindRuby.cmake 
Log Message:
use HINTS instead of PATHS and also look for libruby-static.a (which is built by default)

Alex


Index: FindRuby.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindRuby.cmake,v
retrieving revision 1.9
retrieving revision 1.10
diff -C 2 -d -r1.9 -r1.10
*** FindRuby.cmake	2 Jan 2008 17:32:17 -0000	1.9
--- FindRuby.cmake	12 Sep 2009 08:38:11 -0000	1.10
***************
*** 69,73 ****
  FIND_PATH(RUBY_INCLUDE_PATH
     NAMES ruby.h
!    PATHS
     ${RUBY_ARCH_DIR}
    /usr/lib/ruby/1.8/i586-linux-gnu/ )
--- 69,73 ----
  FIND_PATH(RUBY_INCLUDE_PATH
     NAMES ruby.h
!    HINTS
     ${RUBY_ARCH_DIR}
    /usr/lib/ruby/1.8/i586-linux-gnu/ )
***************
*** 75,81 ****
  # search the ruby library, the version for MSVC can have the "msvc" prefix and the "static" suffix
  FIND_LIBRARY(RUBY_LIBRARY
!   NAMES ruby ruby1.8 ruby1.9
          msvcrt-ruby18 msvcrt-ruby19 msvcrt-ruby18-static msvcrt-ruby19-static
!   PATHS ${RUBY_POSSIBLE_LIB_DIR}
    )
  
--- 75,81 ----
  # search the ruby library, the version for MSVC can have the "msvc" prefix and the "static" suffix
  FIND_LIBRARY(RUBY_LIBRARY
!   NAMES ruby ruby-static ruby1.8 ruby1.9
          msvcrt-ruby18 msvcrt-ruby19 msvcrt-ruby18-static msvcrt-ruby19-static
!   HINTS ${RUBY_POSSIBLE_LIB_DIR}
    )