ENH: add more ruby paths: sitearch, sitelib, vendorarch, vendorlib (#5531)
-make these variables cached and ADVANCED -remove unused QUIETLY code -document RUBY_LIBRARY Alex
This commit is contained in:
parent
8e644c9dfa
commit
5097640671
|
@ -5,16 +5,12 @@
|
||||||
#
|
#
|
||||||
# RUBY_INCLUDE_PATH = path to where ruby.h can be found
|
# RUBY_INCLUDE_PATH = path to where ruby.h can be found
|
||||||
# RUBY_EXECUTABLE = full path to the ruby binary
|
# RUBY_EXECUTABLE = full path to the ruby binary
|
||||||
|
# RUBY_LIBRARY = full path to the ruby library
|
||||||
|
|
||||||
# Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved.
|
# Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved.
|
||||||
# See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details.
|
# See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details.
|
||||||
|
|
||||||
|
|
||||||
if(RUBY_LIBRARY AND RUBY_INCLUDE_PATH)
|
|
||||||
# Already in cache, be silent
|
|
||||||
set(RUBY_FIND_QUIETLY TRUE)
|
|
||||||
endif (RUBY_LIBRARY AND RUBY_INCLUDE_PATH)
|
|
||||||
|
|
||||||
# RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'`
|
# RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'`
|
||||||
# RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'`
|
# RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'`
|
||||||
# RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'`
|
# RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'`
|
||||||
|
@ -23,20 +19,51 @@ endif (RUBY_LIBRARY AND RUBY_INCLUDE_PATH)
|
||||||
|
|
||||||
FIND_PROGRAM(RUBY_EXECUTABLE NAMES ruby ruby1.8 ruby18 ruby1.9 ruby19)
|
FIND_PROGRAM(RUBY_EXECUTABLE NAMES ruby ruby1.8 ruby18 ruby1.9 ruby19)
|
||||||
|
|
||||||
EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['archdir']"
|
|
||||||
OUTPUT_VARIABLE RUBY_ARCH_DIR)
|
|
||||||
|
|
||||||
|
IF(RUBY_EXECUTABLE AND NOT RUBY_ARCH_DIR)
|
||||||
|
EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['archdir']"
|
||||||
|
OUTPUT_VARIABLE RUBY_ARCH_DIR)
|
||||||
|
|
||||||
EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['libdir']"
|
EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['libdir']"
|
||||||
OUTPUT_VARIABLE RUBY_POSSIBLE_LIB_PATH)
|
OUTPUT_VARIABLE RUBY_POSSIBLE_LIB_DIR)
|
||||||
|
|
||||||
EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['rubylibdir']"
|
EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['rubylibdir']"
|
||||||
OUTPUT_VARIABLE RUBY_RUBY_LIB_PATH)
|
OUTPUT_VARIABLE RUBY_RUBY_LIB_DIR)
|
||||||
|
|
||||||
# remove the new lines from the output by replacing them with empty strings
|
# site_ruby
|
||||||
STRING(REPLACE "\n" "" RUBY_ARCH_DIR "${RUBY_ARCH_DIR}")
|
EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['sitearchdir']"
|
||||||
STRING(REPLACE "\n" "" RUBY_POSSIBLE_LIB_PATH "${RUBY_POSSIBLE_LIB_PATH}")
|
OUTPUT_VARIABLE RUBY_SITEARCH_DIR)
|
||||||
STRING(REPLACE "\n" "" RUBY_RUBY_LIB_PATH "${RUBY_RUBY_LIB_PATH}")
|
|
||||||
|
EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['sitelibdir']"
|
||||||
|
OUTPUT_VARIABLE RUBY_SITELIB_DIR)
|
||||||
|
|
||||||
|
# vendor_ruby available ?
|
||||||
|
EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r vendor-specific -e "print 'true'"
|
||||||
|
OUTPUT_VARIABLE RUBY_HAS_VENDOR_RUBY ERROR_QUIET)
|
||||||
|
|
||||||
|
IF(RUBY_HAS_VENDOR_RUBY)
|
||||||
|
EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['vendorlibdir']"
|
||||||
|
OUTPUT_VARIABLE RUBY_VENDORLIB_DIR)
|
||||||
|
|
||||||
|
EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['vendorarchdir']"
|
||||||
|
OUTPUT_VARIABLE RUBY_VENDORARCH_DIR)
|
||||||
|
ENDIF(RUBY_HAS_VENDOR_RUBY)
|
||||||
|
|
||||||
|
# save the results in the cache so we don't have to run ruby the next time again
|
||||||
|
SET(RUBY_ARCH_DIR ${RUBY_ARCH_DIR} CACHE PATH "The Ruby arch dir")
|
||||||
|
SET(RUBY_POSSIBLE_LIB_DIR ${RUBY_POSSIBLE_LIB_DIR} CACHE PATH "The Ruby lib dir")
|
||||||
|
SET(RUBY_RUBY_LIB_DIR ${RUBY_RUBY_LIB_DIR} CACHE PATH "The Ruby ruby-lib dir")
|
||||||
|
SET(RUBY_SITEARCH_DIR ${RUBY_SITEARCH_DIR} CACHE PATH "The Ruby site arch dir")
|
||||||
|
SET(RUBY_SITELIB_DIR ${RUBY_SITELIB_DIR} CACHE PATH "The Ruby site lib dir")
|
||||||
|
SET(RUBY_HAS_VENDOR_RUBY ${RUBY_HAS_VENDOR_RUBY} CACHE BOOL "Vendor Ruby is available")
|
||||||
|
SET(RUBY_VENDORARCH_DIR ${RUBY_VENDORARCH_DIR} CACHE PATH "The Ruby vendor arch dir")
|
||||||
|
SET(RUBY_VENDORLIB_DIR ${RUBY_VENDORLIB_DIR} CACHE PATH "The Ruby vendor lib dir")
|
||||||
|
|
||||||
|
ENDIF(RUBY_EXECUTABLE AND NOT RUBY_ARCH_DIR)
|
||||||
|
|
||||||
|
# for compatibility
|
||||||
|
SET(RUBY_POSSIBLE_LIB_PATH ${RUBY_POSSIBLE_LIB_DIR})
|
||||||
|
SET(RUBY_RUBY_LIB_PATH ${RUBY_RUBY_LIB_DIR})
|
||||||
|
|
||||||
|
|
||||||
FIND_PATH(RUBY_INCLUDE_PATH
|
FIND_PATH(RUBY_INCLUDE_PATH
|
||||||
|
@ -49,11 +76,19 @@ FIND_PATH(RUBY_INCLUDE_PATH
|
||||||
FIND_LIBRARY(RUBY_LIBRARY
|
FIND_LIBRARY(RUBY_LIBRARY
|
||||||
NAMES ruby ruby1.8 ruby1.9
|
NAMES ruby ruby1.8 ruby1.9
|
||||||
msvcrt-ruby18 msvcrt-ruby19 msvcrt-ruby18-static msvcrt-ruby19-static
|
msvcrt-ruby18 msvcrt-ruby19 msvcrt-ruby18-static msvcrt-ruby19-static
|
||||||
PATHS ${RUBY_POSSIBLE_LIB_PATH}
|
PATHS ${RUBY_POSSIBLE_LIB_DIR}
|
||||||
)
|
)
|
||||||
|
|
||||||
MARK_AS_ADVANCED(
|
MARK_AS_ADVANCED(
|
||||||
RUBY_EXECUTABLE
|
RUBY_EXECUTABLE
|
||||||
RUBY_LIBRARY
|
RUBY_LIBRARY
|
||||||
RUBY_INCLUDE_PATH
|
RUBY_INCLUDE_PATH
|
||||||
|
RUBY_ARCH_DIR
|
||||||
|
RUBY_POSSIBLE_LIB_DIR
|
||||||
|
RUBY_RUBY_LIB_DIR
|
||||||
|
RUBY_SITEARCH_DIR
|
||||||
|
RUBY_SITELIB_DIR
|
||||||
|
RUBY_HAS_VENDOR_RUBY
|
||||||
|
RUBY_VENDORARCH_DIR
|
||||||
|
RUBY_VENDORLIB_DIR
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue