Compare commits

..

No commits in common. "bee451685f6edbff20313b6e3ac150ae9429a58d" and "4611d07a41afb728a60b21253b8d3733b3c1c02a" have entirely different histories.

2 changed files with 14 additions and 22 deletions

View File

@ -11,13 +11,9 @@ if(BUILD_BREATHE_DOC STREQUAL AUTO)
include(FindPythonModule) include(FindPythonModule)
find_python_module(breathe) find_python_module(breathe)
find_python_module(recommonmark) find_python_module(recommonmark)
if(DOXYGEN_FOUND AND PERL_FOUND AND PYTHONINTERP_FOUND AND SPHINX_FOUND AND breathe_FOUND AND recommonmark_FOUND) if(DOXYGEN_FOUND AND PERL_FOUND AND PYTHONINTERP_FOUND AND SPHINX_FOUND AND breathe AND recommonmark)
set(BUILD_BREATHE_DOC ON CACHE STRING "Enable documntation in Breathe format" FORCE) set(BUILD_BREATHE_DOC ON CACHE STRING "Enable documntation in Breathe format" FORCE)
else()
set(BUILD_BREATHE_DOC OFF CACHE STRING "Disable documentation in Breathe format" FORCE)
endif() endif()
else()
set(BUILD_BREATHE_DOC OFF CACHE STRING "Disable documentation in Breathe format" FORCE)
endif() endif()
elseif(BUILD_BREATHE_DOC) elseif(BUILD_BREATHE_DOC)
find_package(Doxygen REQUIRED) find_package(Doxygen REQUIRED)
@ -28,9 +24,9 @@ elseif(BUILD_BREATHE_DOC)
include(FindPythonModule) include(FindPythonModule)
find_python_module(breathe REQUIRED) find_python_module(breathe REQUIRED)
find_python_module(recommonmark REQUIRED) find_python_module(recommonmark REQUIRED)
set(BUILD_BREATHE_DOC ON CACHE STRING "Enable documentation in Breathe format" FORCE) set(BUILD_BREATHE_DOC ON CACHE STRING "Enable documntation in Breathe format" FORCE)
else() else()
set(BUILD_BREATHE_DOC OFF CACHE STRING "Disable documentation in Breathe format" FORCE) set(BUILD_BREATHE_DOC OFF CACHE STRING "Enable documntation in Breathe format" FORCE)
endif() endif()
function(add_breathe_doc) function(add_breathe_doc)

View File

@ -1,7 +1,6 @@
function(add_pvs_check) function(add_pvs_check)
list(GET ARGN 0 _target) list(GET ARGN 0 _target)
if (CMAKE_EXPORT_COMPILE_COMMANDS)
include(PVS-Studio) include(PVS-Studio)
find_program(PVS_STUDIO_ANALYZER_EXE NAMES pvs-studio-analyzer) find_program(PVS_STUDIO_ANALYZER_EXE NAMES pvs-studio-analyzer)
if(PVS_STUDIO_ANALYZER_EXE) if(PVS_STUDIO_ANALYZER_EXE)
@ -15,8 +14,5 @@ function(add_pvs_check)
else() else()
message(WARNING "PVS-Studio is not found") message(WARNING "PVS-Studio is not found")
endif() endif()
else()
message(WARNING "Option CMAKE_EXPORT_COMPILE_COMMANDS is not set. PVS checks will be disabled.")
endif()
endfunction() endfunction()