[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1830-g9c9c50c
Brad King
brad.king at kitware.com
Fri Feb 28 08:47:53 EST 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 9c9c50c27112726a50cafc69b6ac83541981bc55 (commit)
via 57abfeaac55bd1b94c8e1f9f4d06f90910d86aa8 (commit)
via 165f6430d957173a0c3fda48265d8ed761700e20 (commit)
from a5c312be24e966f5b14367065a2e7b6109405f3a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9c9c50c27112726a50cafc69b6ac83541981bc55
commit 9c9c50c27112726a50cafc69b6ac83541981bc55
Merge: a5c312b 57abfea
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 28 08:47:52 2014 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 28 08:47:52 2014 -0500
Merge topic 'FindRuby-2' into next
57abfeaa Help: Add FindRuby-2 topic release notes
165f6430 FindRuby: Add support for Ruby 2.0 and 2.1
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=57abfeaac55bd1b94c8e1f9f4d06f90910d86aa8
commit 57abfeaac55bd1b94c8e1f9f4d06f90910d86aa8
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 28 08:47:12 2014 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 28 08:47:12 2014 -0500
Help: Add FindRuby-2 topic release notes
diff --git a/Help/release/dev/FindRuby-2.rst b/Help/release/dev/FindRuby-2.rst
new file mode 100644
index 0000000..50d9a48
--- /dev/null
+++ b/Help/release/dev/FindRuby-2.rst
@@ -0,0 +1,4 @@
+FindRuby-2
+----------
+
+* The :module:`FindRuby` module learned to search for Ruby 2.0 and 2.1.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=165f6430d957173a0c3fda48265d8ed761700e20
commit 165f6430d957173a0c3fda48265d8ed761700e20
Author: Bas Couwenberg <sebastic at xs4all.nl>
AuthorDate: Fri Feb 28 14:12:18 2014 +0100
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 28 08:41:33 2014 -0500
FindRuby: Add support for Ruby 2.0 and 2.1
The most significant change since Ruby 1.9 is the changed path of
config.h, from RbConfig::CONFIG['rubyhdrdir'] to
RbConfig::CONFIG['rubyarchhdrdir'].
diff --git a/Modules/FindRuby.cmake b/Modules/FindRuby.cmake
index 9d9383d..aafdc09 100644
--- a/Modules/FindRuby.cmake
+++ b/Modules/FindRuby.cmake
@@ -5,7 +5,8 @@
# Find Ruby
#
# This module finds if Ruby is installed and determines where the
-# include files and libraries are. Ruby 1.8 and 1.9 are supported.
+# include files and libraries are. Ruby 1.8, 1.9, 2.0 and 2.1 are
+# supported.
#
# The minimum required version of Ruby can be specified using the
# standard syntax, e.g. find_package(Ruby 1.8)
@@ -67,6 +68,8 @@ else()
endif()
if(NOT Ruby_FIND_VERSION_EXACT)
+ list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.1 ruby21)
+ list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.0 ruby20)
list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby1.9 ruby19)
# if we want a version below 1.9, also look for ruby 1.8
@@ -79,7 +82,6 @@ endif()
find_program(RUBY_EXECUTABLE NAMES ${_RUBY_POSSIBLE_EXECUTABLE_NAMES})
-
if(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR)
function(_RUBY_CONFIG_VAR RBVAR OUTVAR)
execute_process(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['${RBVAR}']"
@@ -105,6 +107,7 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR)
_RUBY_CONFIG_VAR("archdir" RUBY_ARCH_DIR)
_RUBY_CONFIG_VAR("arch" RUBY_ARCH)
_RUBY_CONFIG_VAR("rubyhdrdir" RUBY_HDR_DIR)
+ _RUBY_CONFIG_VAR("rubyarchhdrdir" RUBY_ARCHHDR_DIR)
_RUBY_CONFIG_VAR("libdir" RUBY_POSSIBLE_LIB_DIR)
_RUBY_CONFIG_VAR("rubylibdir" RUBY_RUBY_LIB_DIR)
@@ -126,7 +129,8 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR)
set(RUBY_VERSION_MINOR ${RUBY_VERSION_MINOR} CACHE PATH "The Ruby minor version" FORCE)
set(RUBY_VERSION_PATCH ${RUBY_VERSION_PATCH} CACHE PATH "The Ruby patch version" FORCE)
set(RUBY_ARCH_DIR ${RUBY_ARCH_DIR} CACHE PATH "The Ruby arch dir" FORCE)
- set(RUBY_HDR_DIR ${RUBY_HDR_DIR} CACHE PATH "The Ruby header dir (1.9)" FORCE)
+ set(RUBY_HDR_DIR ${RUBY_HDR_DIR} CACHE PATH "The Ruby header dir (1.9+)" FORCE)
+ set(RUBY_ARCHHDR_DIR ${RUBY_ARCHHDR_DIR} CACHE PATH "The Ruby arch header dir (2.0+)" FORCE)
set(RUBY_POSSIBLE_LIB_DIR ${RUBY_POSSIBLE_LIB_DIR} CACHE PATH "The Ruby lib dir" FORCE)
set(RUBY_RUBY_LIB_DIR ${RUBY_RUBY_LIB_DIR} CACHE PATH "The Ruby ruby-lib dir" FORCE)
set(RUBY_SITEARCH_DIR ${RUBY_SITEARCH_DIR} CACHE PATH "The Ruby site arch dir" FORCE)
@@ -139,6 +143,7 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR)
RUBY_ARCH_DIR
RUBY_ARCH
RUBY_HDR_DIR
+ RUBY_ARCHHDR_DIR
RUBY_POSSIBLE_LIB_DIR
RUBY_RUBY_LIB_DIR
RUBY_SITEARCH_DIR
@@ -160,10 +165,20 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR)
set(RUBY_VERSION_MINOR 8)
set(RUBY_VERSION_PATCH 0)
# check whether we found 1.9.x
- if(${RUBY_EXECUTABLE} MATCHES "ruby1.?9" OR RUBY_HDR_DIR)
+ if(${RUBY_EXECUTABLE} MATCHES "ruby1.?9")
set(RUBY_VERSION_MAJOR 1)
set(RUBY_VERSION_MINOR 9)
endif()
+ # check whether we found 2.0.x
+ if(${RUBY_EXECUTABLE} MATCHES "ruby2.?0")
+ set(RUBY_VERSION_MAJOR 2)
+ set(RUBY_VERSION_MINOR 0)
+ endif()
+ # check whether we found 2.1.x
+ if(${RUBY_EXECUTABLE} MATCHES "ruby2.?1")
+ set(RUBY_VERSION_MAJOR 2)
+ set(RUBY_VERSION_MINOR 1)
+ endif()
endif()
if(RUBY_VERSION_MAJOR)
@@ -189,6 +204,7 @@ if( "${Ruby_FIND_VERSION_SHORT_NODOT}" GREATER 18 OR "${_RUBY_VERSION_SHORT_NO
HINTS
${RUBY_HDR_DIR}/${RUBY_ARCH}
${RUBY_ARCH_DIR}
+ ${RUBY_ARCHHDR_DIR}
)
set(RUBY_INCLUDE_DIRS ${RUBY_INCLUDE_DIRS} ${RUBY_CONFIG_INCLUDE_DIR} )
-----------------------------------------------------------------------
Summary of changes:
Help/release/dev/FindRuby-2.rst | 4 ++++
Modules/FindRuby.cmake | 24 ++++++++++++++++++++----
2 files changed, 24 insertions(+), 4 deletions(-)
create mode 100644 Help/release/dev/FindRuby-2.rst
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list