mirror of
https://github.com/SFML/SFML.git
synced 2024-11-28 22:31:09 +08:00
Fix configuration conflict in doxygen 1.10.0
This commit is contained in:
parent
174448f5fa
commit
d95f99acf1
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
# find doxygen
|
# find doxygen
|
||||||
if(SFML_OS_MACOSX)
|
if(SFML_OS_MACOSX)
|
||||||
# Add some path to search doxygen in more directories.
|
# 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"
|
PATHS "C:/Program Files/HTML Help Workshop" "C:/Program Files (x86)/HTML Help Workshop"
|
||||||
DOC "HTML Help Compiler program")
|
DOC "HTML Help Compiler program")
|
||||||
if(DOXYGEN_HHC_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()
|
else()
|
||||||
set(DOXYGEN_GENERATE_HTMLHELP NO)
|
set(DOXYGEN_GENERATE_HTMLHELP NO)
|
||||||
endif()
|
endif()
|
||||||
|
Loading…
Reference in New Issue
Block a user