Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Doxygen Generation #2986

Merged
merged 7 commits into from
May 9, 2024
+233 −78
Merged

Fix Doxygen Generation #2986

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8e0bd30
Fix configuration conflict in doxygen 1.10.0
eXpl0it3r May 7, 2024
04f5675
Update doxygen input file for doxygen 1.10.0
eXpl0it3r May 7, 2024
2dc5c67
Fix missing namespace and file references
eXpl0it3r May 7, 2024
59a4beb
Fix XHTML Doxygen docs inconsistencies
eXpl0it3r May 7, 2024
b9e4e63
Fix search.js "Uncaught ReferenceError: Cookie is not defined"
kimci86 May 8, 2024
9111429
Make the new doxygen clipboard feature work and look good
kimci86 May 8, 2024
44eb058
Update icons urls and color
kimci86 May 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions doc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

# find doxygen
if(SFML_OS_MACOSX)
# Add some path to search doxygen in more directories.
Expand Down Expand Up @@ -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()
ChrisThrasher marked this conversation as resolved.
Show resolved Hide resolved
else()
set(DOXYGEN_GENERATE_HTMLHELP NO)
endif()
Expand Down