[Cmake-commits] CMake branch, next, updated. v2.8.7-1975-g1e885d6
Alexander Neundorf
neundorf at kde.org
Thu Jan 5 16:11:14 EST 2012
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 1e885d62cef2c1827992a6003adca512196ac5c1 (commit)
via a9bca052f8ff013d8f47cf365495d2c8d0a2e70f (commit)
via 3db2c8b9eafe4cc1d3a6e9d1f3bfc90764544d01 (commit)
via 93c55ec1421a2cf43dbcaf9afd0528c8dda42de5 (commit)
via a823d8814922cf2c83420f98bb7f2a2ac1d2f0e3 (commit)
via d6f59a529371698b15f84f71e493673ae13dfcee (commit)
from 9064b55fd578f876714dd9a529491c0252d67841 (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=1e885d62cef2c1827992a6003adca512196ac5c1
commit 1e885d62cef2c1827992a6003adca512196ac5c1
Merge: 9064b55 a9bca05
Author: Alexander Neundorf <neundorf at kde.org>
AuthorDate: Thu Jan 5 16:11:11 2012 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 5 16:11:11 2012 -0500
Merge topic 'FindRubyFixes' into next
a9bca05 FindRuby.cmake: add more debug output
3db2c8b FindRuby: add more possible library names (for ubuntu, #12172)
93c55ec FindRuby: fix usage of RUBY_VERSION_MAJOR (#12172)
a823d88 KWSys Nightly Date Stamp
d6f59a5 KWSys Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a9bca052f8ff013d8f47cf365495d2c8d0a2e70f
commit a9bca052f8ff013d8f47cf365495d2c8d0a2e70f
Author: Alex Neundorf <neundorf at kde.org>
AuthorDate: Thu Jan 5 21:58:49 2012 +0100
Commit: Alex Neundorf <neundorf at kde.org>
CommitDate: Thu Jan 5 21:58:49 2012 +0100
FindRuby.cmake: add more debug output
Alex
diff --git a/Modules/FindRuby.cmake b/Modules/FindRuby.cmake
index 2923831..5d6c98a 100644
--- a/Modules/FindRuby.cmake
+++ b/Modules/FindRuby.cmake
@@ -224,6 +224,10 @@ IF(_RUBY_DEBUG_OUTPUT)
MESSAGE(STATUS "RUBY_POSSIBLE_LIB_DIR: ${RUBY_POSSIBLE_LIB_DIR}")
MESSAGE(STATUS "Found RUBY_VERSION: \"${RUBY_VERSION}\" , short: \"${_RUBY_VERSION_SHORT}\", nodot: \"${_RUBY_VERSION_SHORT_NODOT}\"")
MESSAGE(STATUS "_RUBY_REQUIRED_VARS: ${_RUBY_REQUIRED_VARS}")
+ MESSAGE(STATUS "RUBY_EXECUTABLE: ${RUBY_EXECUTABLE}")
+ MESSAGE(STATUS "RUBY_LIBRARY: ${RUBY_LIBRARY}")
+ MESSAGE(STATUS "RUBY_INCLUDE_DIR: ${RUBY_INCLUDE_DIR}")
+ MESSAGE(STATUS "RUBY_CONFIG_INCLUDE_DIR: ${RUBY_CONFIG_INCLUDE_DIR}")
MESSAGE(STATUS "--------------------")
ENDIF(_RUBY_DEBUG_OUTPUT)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3db2c8b9eafe4cc1d3a6e9d1f3bfc90764544d01
commit 3db2c8b9eafe4cc1d3a6e9d1f3bfc90764544d01
Author: Alex Neundorf <neundorf at kde.org>
AuthorDate: Thu Jan 5 21:57:11 2012 +0100
Commit: Alex Neundorf <neundorf at kde.org>
CommitDate: Thu Jan 5 21:57:11 2012 +0100
FindRuby: add more possible library names (for ubuntu, #12172)
Alex
diff --git a/Modules/FindRuby.cmake b/Modules/FindRuby.cmake
index 402568b..2923831 100644
--- a/Modules/FindRuby.cmake
+++ b/Modules/FindRuby.cmake
@@ -180,7 +180,7 @@ ENDIF( ${Ruby_FIND_VERSION_SHORT_NODOT} GREATER 18 OR ${_RUBY_VERSION_SHORT_NO
# Determine the list of possible names for the ruby library
-SET(_RUBY_POSSIBLE_LIB_NAMES ruby ruby-static ruby${_RUBY_VERSION_SHORT} ruby${_RUBY_VERSION_SHORT_NODOT})
+SET(_RUBY_POSSIBLE_LIB_NAMES ruby ruby-static ruby${_RUBY_VERSION_SHORT} ruby${_RUBY_VERSION_SHORT_NODOT} ruby-${_RUBY_VERSION_SHORT} ruby-${RUBY_VERSION})
IF(WIN32)
SET( _RUBY_MSVC_RUNTIME "" )
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=93c55ec1421a2cf43dbcaf9afd0528c8dda42de5
commit 93c55ec1421a2cf43dbcaf9afd0528c8dda42de5
Author: Alex Neundorf <neundorf at kde.org>
AuthorDate: Thu Jan 5 21:53:02 2012 +0100
Commit: Alex Neundorf <neundorf at kde.org>
CommitDate: Thu Jan 5 21:53:02 2012 +0100
FindRuby: fix usage of RUBY_VERSION_MAJOR (#12172)
Alex
diff --git a/Modules/FindRuby.cmake b/Modules/FindRuby.cmake
index ae2ea2e..402568b 100644
--- a/Modules/FindRuby.cmake
+++ b/Modules/FindRuby.cmake
@@ -60,7 +60,7 @@ ENDIF("${Ruby_FIND_VERSION_SHORT_NODOT}" VERSION_LESS "19")
FIND_PROGRAM(RUBY_EXECUTABLE NAMES ${_RUBY_POSSIBLE_EXECUTABLE_NAMES})
-IF(RUBY_EXECUTABLE AND NOT RUBY_MAJOR_VERSION)
+IF(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR)
# query the ruby version
EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['MAJOR']"
OUTPUT_VARIABLE RUBY_VERSION_MAJOR)
@@ -135,7 +135,7 @@ IF(RUBY_EXECUTABLE AND NOT RUBY_MAJOR_VERSION)
RUBY_VERSION_MINOR
RUBY_VERSION_PATCH
)
-ENDIF(RUBY_EXECUTABLE AND NOT RUBY_MAJOR_VERSION)
+ENDIF(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR)
# In case RUBY_EXECUTABLE could not be executed (e.g. cross compiling)
# try to detect which version we found. This is not too good.
-----------------------------------------------------------------------
Summary of changes:
Modules/FindRuby.cmake | 10 +++++++---
Source/kwsys/kwsysDateStamp.cmake | 2 +-
2 files changed, 8 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list