alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-03-15 04:57:30 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmake: added guard for version checks on Sphinx and Yuidoc

Browse Source 
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
This commit is contained in:
Mihai Tudor Panu 2015-05-28 10:57:09 -07:00
parent cbe7b64a97
commit d614719d1d
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/modules/FindSphinx.cmake
View File

@ -21,8 +21,10 @@ find_package_handle_standard_args (Sphinx DEFAULT_MSG
if (SPHINX_EXECUTABLE) if (SPHINX_EXECUTABLE)
execute_process(COMMAND ${SPHINX_EXECUTABLE} --version execute_process(COMMAND ${SPHINX_EXECUTABLE} --version
OUTPUT_VARIABLE SPHINX_VERSION) OUTPUT_VARIABLE SPHINX_VERSION)
string(REGEX MATCH "([0-9]\\.[0-9]\\.[0-9])" SPHINX_VERSION_STR ${SPHINX_VERSION}) if(SPHINX_VERSION)
message ("INFO - Sphinx version is " ${SPHINX_VERSION_STR}) string(REGEX MATCH "([0-9]\\.[0-9]\\.[0-9])" SPHINX_VERSION_STR ${SPHINX_VERSION})
message ("INFO - Sphinx version is " ${SPHINX_VERSION_STR})
endif()
endif () endif ()
mark_as_advanced (SPHINX_EXECUTABLE) mark_as_advanced (SPHINX_EXECUTABLE)

6
cmake/modules/FindYuidoc.cmake
View File

@ -1,6 +1,6 @@
find_program (YUIDOC_EXECUTABLE NAMES yuidoc find_program (YUIDOC_EXECUTABLE NAMES yuidoc
HINTS $ENV{YUIDOC_DIR} HINTS $ENV{YUIDOC_DIR}
PATHS usr usr/local PATHS usr usr/local
PATH_SUFFIXES bin PATH_SUFFIXES bin
DOC "Yuidoc documentation generator" DOC "Yuidoc documentation generator"
) )
@ -15,7 +15,9 @@ find_package_handle_standard_args (Yuidoc DEFAULT_MSG
if (YUIDOC_EXECUTABLE) if (YUIDOC_EXECUTABLE)
execute_process(COMMAND ${YUIDOC_EXECUTABLE} --version execute_process(COMMAND ${YUIDOC_EXECUTABLE} --version
ERROR_VARIABLE YUIDOC_VERSION) ERROR_VARIABLE YUIDOC_VERSION)
message ("INFO - Yuidoc version is " ${YUIDOC_VERSION}) if(YUIDOC_VERSION)
message ("INFO - Yuidoc version is " ${YUIDOC_VERSION})
endif()
endif () endif ()
mark_as_advanced (YUIDOC_EXECUTABLE) mark_as_advanced (YUIDOC_EXECUTABLE)