niklas/cyclonedds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix version number parse bug in FindSphinx.cmake

Browse source 
Signed-off-by: Jeroen Koekkoek <jeroen@koekkoek.nl>
This commit is contained in:
Jeroen Koekkoek 2019-08-02 13:06:43 +02:00
parent b916f0bfb7
commit 0351963670
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cmake/Modules/FindSphinx.cmake
View file

@ -26,7 +26,7 @@ macro(_Sphinx_find_executable _exe)
RESULT_VARIABLE _result RESULT_VARIABLE _result
OUTPUT_VARIABLE _output OUTPUT_VARIABLE _output
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)
if(_result EQUAL 0 AND _output MATCHES " ([0-9]+\\.[0-9]+\\.[0-9]+)$") if(_result EQUAL 0 AND _output MATCHES " v?([0-9]+\\.[0-9]+\\.[0-9]+)$")
set(SPHINX_${_uc}_VERSION "${CMAKE_MATCH_1}") set(SPHINX_${_uc}_VERSION "${CMAKE_MATCH_1}")
endif() endif()
@ -85,8 +85,8 @@ _Sphinx_find_executable(quickstart)
# #
if(SPHINX_BUILD_EXECUTABLE AND SPHINX_QUICKSTART_EXECUTABLE) if(SPHINX_BUILD_EXECUTABLE AND SPHINX_QUICKSTART_EXECUTABLE)
if(NOT SPHINX_BUILD_VERSION STREQUAL SPHINX_QUICKSTART_VERSION) if(NOT SPHINX_BUILD_VERSION STREQUAL SPHINX_QUICKSTART_VERSION)
message(FATAL_ERROR "Versions for sphinx-build (${SPHINX_BUILD_VERSION})" message(FATAL_ERROR "Versions for sphinx-build (${SPHINX_BUILD_VERSION}) "
"and sphinx-quickstart (${SPHINX_QUICKSTART_VERSION})" "and sphinx-quickstart (${SPHINX_QUICKSTART_VERSION}) "
"do not match") "do not match")
endif() endif()
endif() endif()