[Cmake-commits] [cmake-commits] alex committed FindRuby.cmake 1.13 1.14

[cmake-commits at cmake.org]

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

Modified Files:
	FindRuby.cmake 
Log Message:
make FindRuby work on Windows e.g. with ruby 1.9.1 (version string was constructed wrong)

Alex


Index: FindRuby.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindRuby.cmake,v
retrieving revision 1.13
retrieving revision 1.14
diff -C 2 -d -r1.13 -r1.14
*** FindRuby.cmake	28 Sep 2009 15:45:40 -0000	1.13
--- FindRuby.cmake	3 Jan 2010 19:21:17 -0000	1.14
***************
*** 153,156 ****
--- 153,157 ----
  SET(_RUBY_VERSION_SHORT "${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}")
  SET(_RUBY_VERSION_SHORT_NODOT "${RUBY_VERSION_MAJOR}${RUBY_VERSION_MINOR}")
+ SET(_RUBY_NODOT_VERSION "${RUBY_VERSION_MAJOR}${RUBY_VERSION_MINOR}${RUBY_VERSION_PATCH}")
  
  # Now we know which version we found
***************
*** 215,222 ****
  
     LIST(APPEND _RUBY_POSSIBLE_LIB_NAMES
!                "msvcr${_RUBY_MSVC_RUNTIME}-ruby${RUBY_NODOT_VERSION}"
!                "msvcr${_RUBY_MSVC_RUNTIME}-ruby${RUBY_NODOT_VERSION}-static" 
!                "msvcrt-ruby${RUBY_NODOT_VERSION}"
!                "msvcrt-ruby${RUBY_NODOT_VERSION}-static" )
  ENDIF(WIN32)
  
--- 216,223 ----
  
     LIST(APPEND _RUBY_POSSIBLE_LIB_NAMES
!                "msvcr${_RUBY_MSVC_RUNTIME}-ruby${_RUBY_NODOT_VERSION}"
!                "msvcr${_RUBY_MSVC_RUNTIME}-ruby${_RUBY_NODOT_VERSION}-static" 
!                "msvcrt-ruby${_RUBY_NODOT_VERSION}"
!                "msvcrt-ruby${_RUBY_NODOT_VERSION}-static" )
  ENDIF(WIN32)