diff options
| author | Brad King <brad.king@kitware.com> | 2010-09-21 14:39:33 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2010-09-21 14:39:33 (GMT) |
| commit | a8d0539598ecd5513795f928c0474a97bcef0b11 (patch) | |
| tree | a2b306c437755a213dcd2791103a11860e94eab3 /Modules | |
| parent | f2a5b85e6851df13be5fc98936a0e33f4f7e16fb (diff) | |
| parent | 38691d91a58b416fd4698047b037c8123e133e2b (diff) | |
| download | CMake-a8d0539598ecd5513795f928c0474a97bcef0b11.zip CMake-a8d0539598ecd5513795f928c0474a97bcef0b11.tar.gz CMake-a8d0539598ecd5513795f928c0474a97bcef0b11.tar.bz2 | |
Merge topic '11249_FindFLEX'
38691d9 FindFLEX.cmake: Fix issue 11249
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindFLEX.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
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}") |