From d95f99acf13cd887351fe627631eb4e8304becce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20D=C3=BCrrenberger?= Date: Tue, 7 May 2024 20:50:12 +0200 Subject: [PATCH] Fix configuration conflict in doxygen 1.10.0 --- doc/CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 7b3146dd8..3a0dbebee 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -1,4 +1,3 @@ - # find doxygen if(SFML_OS_MACOSX) # Add some path to search doxygen in more directories. @@ -27,7 +26,12 @@ if(SFML_OS_WINDOWS) PATHS "C:/Program Files/HTML Help Workshop" "C:/Program Files (x86)/HTML Help Workshop" DOC "HTML Help Compiler program") if(DOXYGEN_HHC_PROGRAM) - set(DOXYGEN_GENERATE_HTMLHELP YES) + if(DOXYGEN_VERSION VERSION_LESS "1.10.0") + set(DOXYGEN_GENERATE_HTMLHELP YES) + else() + message("Due to conflicts with the HTML output settings in Doxygen ${DOXYGEN_VERSION}, the HTML Help generation will be disabled") + set(DOXYGEN_GENERATE_HTMLHELP NO) + endif() else() set(DOXYGEN_GENERATE_HTMLHELP NO) endif()