summaryrefslogtreecommitdiffstats
path: root/Modules/FindRuby.cmake
diff options
context:
space:
mode:
authorAlexander Neundorf <neundorf@kde.org>2010-01-03 19:21:17 (GMT)
committerAlexander Neundorf <neundorf@kde.org>2010-01-03 19:21:17 (GMT)
commit241dd180049ae804242686ab11e3b370fc32b6d2 (patch)
treeea803090e989df7c0c33c47aa3072482f9b1997b /Modules/FindRuby.cmake
parent827b636393bc8146ab4ae52ba54b1a0b85ed71ce (diff)
downloadCMake-241dd180049ae804242686ab11e3b370fc32b6d2.zip
CMake-241dd180049ae804242686ab11e3b370fc32b6d2.tar.gz
CMake-241dd180049ae804242686ab11e3b370fc32b6d2.tar.bz2
make FindRuby work on Windows e.g. with ruby 1.9.1 (version string was constructed wrong)
Alex
Diffstat (limited to 'Modules/FindRuby.cmake')
-rw-r--r--Modules/FindRuby.cmake9
1 files changed, 5 insertions, 4 deletions
diff --git a/Modules/FindRuby.cmake b/Modules/FindRuby.cmake
index cf7710e..5604531 100644
--- a/Modules/FindRuby.cmake
+++ b/Modules/FindRuby.cmake
@@ -152,6 +152,7 @@ ENDIF(NOT RUBY_VERSION_MAJOR)
SET(RUBY_VERSION "${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}.${RUBY_VERSION_PATCH}")
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
IF(Ruby_FIND_VERSION)
@@ -214,10 +215,10 @@ IF(WIN32)
ENDIF( MSVC90 )
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" )
+ "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)
FIND_LIBRARY(RUBY_LIBRARY NAMES ${_RUBY_POSSIBLE_LIB_NAMES} HINTS ${RUBY_POSSIBLE_LIB_DIR} )