diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b84989a7e..6395b1fd18 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -562,23 +562,12 @@ include(cmake/OpenCVFindLibsPerf.cmake) # Detect other 3rd-party libraries/tools # ---------------------------------------------------------------------------- -# --- Doxygen and PlantUML for documentation --- -unset(DOXYGEN_FOUND CACHE) +# --- Doxygen for documentation --- if(BUILD_DOCS) find_package(Doxygen) - if (PLANTUML_JAR) - message(STATUS "Using PlantUML path from command line: ${PLANTUML_JAR}") - elseif(DEFINED ENV{PLANTUML_JAR}) - set(PLANTUML_JAR $ENV{PLANTUML_JAR}) - message(STATUS "Using PLantUML path from environment: ${PLANTUML_JAR}") - else() - message(STATUS "To enable PlantUML support, set PLANTUML_JAR environment variable or pass -DPLANTUML_JAR= option to cmake") - endif() - if (PLANTUML_JAR AND DOXYGEN_VERSION VERSION_LESS 1.8.8) - message(STATUS "You need Doxygen version 1.8.8 or later to use PlantUML") - unset(PLANTUML_JAR) - endif() -endif(BUILD_DOCS) +else() + unset(DOXYGEN_FOUND CACHE) +endif() # --- Python Support --- include(cmake/OpenCVDetectPython.cmake) @@ -1341,7 +1330,6 @@ if(BUILD_DOCS) status("") status(" Documentation:") status(" Doxygen:" DOXYGEN_FOUND THEN "${DOXYGEN_EXECUTABLE} (ver ${DOXYGEN_VERSION})" ELSE NO) - status(" PlantUML:" PLANTUML_JAR THEN "${PLANTUML_JAR}" ELSE NO) endif() # ========================== samples and tests ========================== diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index ef579fb97c..6825b5199f 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -159,12 +159,6 @@ if(BUILD_DOCS AND DOXYGEN_FOUND) list(APPEND CMAKE_DOXYGEN_HTML_FILES "${CMAKE_CURRENT_SOURCE_DIR}/mymath.sty") string(REPLACE ";" " \\\n" CMAKE_DOXYGEN_HTML_FILES "${CMAKE_DOXYGEN_HTML_FILES}") - if(PLANTUML_JAR) - set(CMAKE_DOXYGEN_PLANTUML_SUPPORT "PLANTUML_JAR_PATH = ${PLANTUML_JAR}\n") - else() - set(CMAKE_DOXYGEN_PLANTUML_SUPPORT "ALIASES += startuml{1}=\"@warning __No plantuml!__ \\n \\n @if DUMMY_PLANTUML_CODE\" enduml=\"@endif\"\n") - endif() - # writing file configure_file(Doxyfile.in ${doxyfile} @ONLY) configure_file(root.markdown.in ${rootfile} @ONLY) diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index 45c085cc34..f0c15e01b0 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -286,4 +286,3 @@ DOT_TRANSPARENT = NO DOT_MULTI_TARGETS = NO GENERATE_LEGEND = YES DOT_CLEANUP = YES -@CMAKE_DOXYGEN_PLANTUML_SUPPORT@