Skip to content

Commit 55d73a2

Browse files
Prevent html options from being applied to manpage generation
When both BUILD_HTML_DOCUMENTATION and BUILD_MAN_DOCUMENTATION are ON, DOXYGEN_GENERATE_HTML was set to YES (and some other HTML-only variables were set) whenever Doxyfile.man was generated, and therefore `make man` would also populate DOCS/explore-html, but with less detail due to the other differences between Doxyfile.man and Doxyfile.html.
1 parent 7952995 commit 55d73a2

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

CMakeLists.txt

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -630,8 +630,6 @@ if(BUILD_HTML_DOCUMENTATION OR BUILD_MAN_DOCUMENTATION)
630630
set(DOXYGEN_INTERACTIVE_SVG YES)
631631
set(DOXYGEN_WARN_NO_PARAMDOC YES)
632632
set(DOXYGEN_WARN_LOGFILE doxygen_error)
633-
set(DOXYGEN_GENERATE_HTML NO)
634-
set(DOXYGEN_GENERATE_MAN NO)
635633
set(DOXYGEN_LAYOUT_FILE "DOCS/DoxygenLayout.xml")
636634

637635
# Exclude functions that are duplicated, creating conflicts.
@@ -646,12 +644,13 @@ if(BUILD_HTML_DOCUMENTATION OR BUILD_MAN_DOCUMENTATION)
646644

647645
if (BUILD_HTML_DOCUMENTATION)
648646
set(DOXYGEN_GENERATE_HTML YES)
649-
set(DOXYGEN_HTML_OUTPUT explore-html)
650-
set(DOXYGEN_HTML_TIMESTAMP YES)
647+
set(DOXYGEN_GENERATE_MAN NO)
651648
set(DOXYGEN_INLINE_SOURCES YES)
652649
set(DOXYGEN_CALL_GRAPH YES)
653650
set(DOXYGEN_CALLER_GRAPH YES)
654651

652+
set(DOXYGEN_HTML_OUTPUT explore-html)
653+
set(DOXYGEN_HTML_TIMESTAMP YES)
655654
doxygen_add_docs(
656655
html
657656

@@ -666,14 +665,17 @@ if(BUILD_HTML_DOCUMENTATION OR BUILD_MAN_DOCUMENTATION)
666665

667666
COMMENT "Generating html LAPACK documentation (it will take some time... time to grab a coffee)"
668667
)
668+
unset(DOXYGEN_HTML_OUTPUT)
669+
unset(DOXYGEN_HTML_TIMESTAMP)
669670
endif()
670671
if (BUILD_MAN_DOCUMENTATION)
672+
set(DOXYGEN_GENERATE_HTML NO)
671673
set(DOXYGEN_GENERATE_MAN YES)
672-
set(DOXYGEN_MAN_LINKS YES)
673674
set(DOXYGEN_INLINE_SOURCES NO)
674675
set(DOXYGEN_CALL_GRAPH NO)
675676
set(DOXYGEN_CALLER_GRAPH NO)
676677

678+
set(DOXYGEN_MAN_LINKS YES)
677679
doxygen_add_docs(
678680
man
679681

@@ -687,6 +689,7 @@ if(BUILD_HTML_DOCUMENTATION OR BUILD_MAN_DOCUMENTATION)
687689

688690
COMMENT "Generating man LAPACK documentation"
689691
)
692+
unset(DOXYGEN_MAN_LINKS)
690693
endif()
691694

692695
endif()

0 commit comments

Comments
 (0)