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 8f6a445ce9be7175797a5a809e97342af0f442a6 (commit) via 680fecf1cf0886c523d5bd48e7445c3724d7fd93 (commit) from 36c3e77609a978b115fb1c8a0d6006ace23385f1 (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=8f6a445ce9be7175797a5a809e97342af0f442a6 commit 8f6a445ce9be7175797a5a809e97342af0f442a6 Merge: 36c3e77 680fecf Author: Rolf Eike Beer <e...@sf-mail.de> AuthorDate: Wed Jan 25 12:16:21 2012 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Wed Jan 25 12:16:21 2012 -0500 Merge topic 'findruby-no-dummy-version' into next 680fecf FindRuby: fix syntax errors if ruby is not installed http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=680fecf1cf0886c523d5bd48e7445c3724d7fd93 commit 680fecf1cf0886c523d5bd48e7445c3724d7fd93 Author: Rolf Eike Beer <e...@sf-mail.de> AuthorDate: Wed Jan 25 18:16:05 2012 +0100 Commit: Rolf Eike Beer <e...@sf-mail.de> CommitDate: Wed Jan 25 18:16:05 2012 +0100 FindRuby: fix syntax errors if ruby is not installed diff --git a/Modules/FindRuby.cmake b/Modules/FindRuby.cmake index 3fd2ded..c4adfd1 100644 --- a/Modules/FindRuby.cmake +++ b/Modules/FindRuby.cmake @@ -151,10 +151,12 @@ IF(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR) ENDIF(${RUBY_EXECUTABLE} MATCHES "ruby1.?9" OR RUBY_HDR_DIR) ENDIF(RUBY_EXECUTABLE AND 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}") +IF(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}") +ENDIF(RUBY_VERSION_MAJOR) FIND_PATH(RUBY_INCLUDE_DIR NAMES ruby.h @@ -166,7 +168,7 @@ FIND_PATH(RUBY_INCLUDE_DIR SET(RUBY_INCLUDE_DIRS ${RUBY_INCLUDE_DIR} ) # if ruby > 1.8 is required or if ruby > 1.8 was found, search for the config.h dir -IF( ${Ruby_FIND_VERSION_SHORT_NODOT} GREATER 18 OR ${_RUBY_VERSION_SHORT_NODOT} GREATER 18 OR RUBY_HDR_DIR) +IF( "${Ruby_FIND_VERSION_SHORT_NODOT}" GREATER 18 OR "${_RUBY_VERSION_SHORT_NODOT}" GREATER 18 OR RUBY_HDR_DIR) FIND_PATH(RUBY_CONFIG_INCLUDE_DIR NAMES ruby/config.h config.h HINTS @@ -175,7 +177,7 @@ IF( ${Ruby_FIND_VERSION_SHORT_NODOT} GREATER 18 OR ${_RUBY_VERSION_SHORT_NODOT ) SET(RUBY_INCLUDE_DIRS ${RUBY_INCLUDE_DIRS} ${RUBY_CONFIG_INCLUDE_DIR} ) -ENDIF( ${Ruby_FIND_VERSION_SHORT_NODOT} GREATER 18 OR ${_RUBY_VERSION_SHORT_NODOT} GREATER 18 OR RUBY_HDR_DIR) +ENDIF( "${Ruby_FIND_VERSION_SHORT_NODOT}" GREATER 18 OR "${_RUBY_VERSION_SHORT_NODOT}" GREATER 18 OR RUBY_HDR_DIR) # Determine the list of possible names for the ruby library ----------------------------------------------------------------------- Summary of changes: Modules/FindRuby.cmake | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits