diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2009-09-12 08:38:11 (GMT) |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2009-09-12 08:38:11 (GMT) |
| commit | ea46c6e8a93e701e6b1c2fc51fe5c27162133130 (patch) | |
| tree | 66c40aef995dc5d6f42be3533527f481c560f64a | |
| parent | c6a10370bb021f9123f7fdb9fa24dcb4fdd2679b (diff) | |
| download | CMake-ea46c6e8a93e701e6b1c2fc51fe5c27162133130.zip CMake-ea46c6e8a93e701e6b1c2fc51fe5c27162133130.tar.gz CMake-ea46c6e8a93e701e6b1c2fc51fe5c27162133130.tar.bz2 | |
use HINTS instead of PATHS and also look for libruby-static.a (which is built by default)
Alex
| -rw-r--r-- | Modules/FindRuby.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/FindRuby.cmake b/Modules/FindRuby.cmake index ea604f9..363cae6 100644 --- a/Modules/FindRuby.cmake +++ b/Modules/FindRuby.cmake @@ -68,15 +68,15 @@ SET(RUBY_RUBY_LIB_PATH ${RUBY_RUBY_LIB_DIR}) FIND_PATH(RUBY_INCLUDE_PATH NAMES ruby.h - PATHS + HINTS ${RUBY_ARCH_DIR} /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 - NAMES ruby ruby1.8 ruby1.9 + NAMES ruby ruby-static ruby1.8 ruby1.9 msvcrt-ruby18 msvcrt-ruby19 msvcrt-ruby18-static msvcrt-ruby19-static - PATHS ${RUBY_POSSIBLE_LIB_DIR} + HINTS ${RUBY_POSSIBLE_LIB_DIR} ) MARK_AS_ADVANCED( |