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 25111637c9b67a6f8349413ad89aaf7aa833abfd (commit)
via 38691d91a58b416fd4698047b037c8123e133e2b (commit)
from 66551b4c1d035aeb36486ffc054b5b30be137876 (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=25111637c9b67a6f8349413ad89aaf7aa833abfd
commit 25111637c9b67a6f8349413ad89aaf7aa833abfd
Merge: 66551b4 38691d9
Author: Philip Lowman <phi...@yhbt.com>
AuthorDate: Sun Sep 19 23:58:26 2010 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Sun Sep 19 23:58:26 2010 -0400
Merge topic '11249_FindFLEX' into next
38691d9 FindFLEX.cmake: Fix issue 11249
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=38691d91a58b416fd4698047b037c8123e133e2b
commit 38691d91a58b416fd4698047b037c8123e133e2b
Author: Philip Lowman <phi...@yhbt.com>
AuthorDate: Sun Sep 19 23:56:34 2010 -0400
Commit: Philip Lowman <phi...@yhbt.com>
CommitDate: Sun Sep 19 23:56:34 2010 -0400
FindFLEX.cmake: Fix issue 11249
FindFLEX no longer sense a CMake fatal error if executing "flex --version"
fails
unless the REQUIRED argument was specified.
diff --git a/Modules/FindFLEX.cmake b/Modules/FindFLEX.cmake
index 55b5639..d42e514 100644
--- a/Modules/FindFLEX.cmake
+++ b/Modules/FindFLEX.cmake
@@ -78,7 +78,11 @@ IF(FLEX_EXECUTABLE)
RESULT_VARIABLE FLEX_version_result
OUTPUT_STRIP_TRAILING_WHITESPACE)
IF(NOT ${FLEX_version_result} EQUAL 0)
- MESSAGE(SEND_ERROR "Command \"${FLEX_EXECUTABLE} --version\" failed with
output:\n${FLEX_version_error}")
+ IF(FLEX_FIND_REQUIRED)
+ MESSAGE(SEND_ERROR "Command \"${FLEX_EXECUTABLE} --version\" failed with
output:\n${FLEX_version_output}\n${FLEX_version_error}")
+ ELSE()
+ MESSAGE("Command \"${FLEX_EXECUTABLE} --version\" failed with
output:\n${FLEX_version_output}\n${FLEX_version_error}\nFLEX_VERSION will not
be available")
+ ENDIF()
ELSE()
STRING(REGEX REPLACE "^flex (.*)$" "\\1"
FLEX_VERSION "${FLEX_version_output}")
-----------------------------------------------------------------------
Summary of changes:
Modules/FindFLEX.cmake | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
