From d614719d1df707b5ff1475fd34d70b53b2ff71de Mon Sep 17 00:00:00 2001 From: Mihai Tudor Panu Date: Thu, 28 May 2015 10:57:09 -0700 Subject: [PATCH] cmake: added guard for version checks on Sphinx and Yuidoc Signed-off-by: Mihai Tudor Panu --- cmake/modules/FindSphinx.cmake | 6 ++++-- cmake/modules/FindYuidoc.cmake | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/cmake/modules/FindSphinx.cmake b/cmake/modules/FindSphinx.cmake index 5cb0d115..5afcd94f 100644 --- a/cmake/modules/FindSphinx.cmake +++ b/cmake/modules/FindSphinx.cmake @@ -21,8 +21,10 @@ find_package_handle_standard_args (Sphinx DEFAULT_MSG if (SPHINX_EXECUTABLE) execute_process(COMMAND ${SPHINX_EXECUTABLE} --version OUTPUT_VARIABLE SPHINX_VERSION) - string(REGEX MATCH "([0-9]\\.[0-9]\\.[0-9])" SPHINX_VERSION_STR ${SPHINX_VERSION}) - message ("INFO - Sphinx version is " ${SPHINX_VERSION_STR}) + if(SPHINX_VERSION) + string(REGEX MATCH "([0-9]\\.[0-9]\\.[0-9])" SPHINX_VERSION_STR ${SPHINX_VERSION}) + message ("INFO - Sphinx version is " ${SPHINX_VERSION_STR}) + endif() endif () mark_as_advanced (SPHINX_EXECUTABLE) diff --git a/cmake/modules/FindYuidoc.cmake b/cmake/modules/FindYuidoc.cmake index cf1a6a0b..554a22f9 100644 --- a/cmake/modules/FindYuidoc.cmake +++ b/cmake/modules/FindYuidoc.cmake @@ -1,6 +1,6 @@ find_program (YUIDOC_EXECUTABLE NAMES yuidoc HINTS $ENV{YUIDOC_DIR} - PATHS usr usr/local + PATHS usr usr/local PATH_SUFFIXES bin DOC "Yuidoc documentation generator" ) @@ -15,7 +15,9 @@ find_package_handle_standard_args (Yuidoc DEFAULT_MSG if (YUIDOC_EXECUTABLE) execute_process(COMMAND ${YUIDOC_EXECUTABLE} --version ERROR_VARIABLE YUIDOC_VERSION) - message ("INFO - Yuidoc version is " ${YUIDOC_VERSION}) + if(YUIDOC_VERSION) + message ("INFO - Yuidoc version is " ${YUIDOC_VERSION}) + endif() endif () mark_as_advanced (YUIDOC_EXECUTABLE)