diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2019-03-13 10:13:09 +0100 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2019-03-13 10:13:09 +0100 |
| commit | 760e30ec03d21d378890ff87eed91a81f040ba98 (patch) | |
| tree | 1145e35c95de7266811ae0c56994647558d9bd6a | |
| parent | 11eb34d86b513f5ffd4fb0e5cb5f31e6d2f92a49 (diff) | |
| download | dbus-760e30ec03d21d378890ff87eed91a81f040ba98.tar.gz | |
Do not let doxygen build man pages on Windows
This fixes an issue on gitlab CI not been able to create man page
output dir. Also man pages does not make sense on Windows.
| -rw-r--r-- | Doxyfile.in | 2 | ||||
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | doc/CMakeLists.txt | 5 |
3 files changed, 13 insertions, 1 deletions
diff --git a/Doxyfile.in b/Doxyfile.in index dbbdb4f7..b5bd51c9 100644 --- a/Doxyfile.in +++ b/Doxyfile.in @@ -127,7 +127,7 @@ RTF_EXTENSIONS_FILE = #--------------------------------------------------------------------------- # configuration options related to the man page output #--------------------------------------------------------------------------- -GENERATE_MAN = YES +GENERATE_MAN = @DBUS_GENERATE_MAN@ MAN_OUTPUT = man MAN_EXTENSION = .3dbus MAN_LINKS = YES diff --git a/configure.ac b/configure.ac index 3b07e0c9..83b3eb72 100644 --- a/configure.ac +++ b/configure.ac @@ -1269,6 +1269,13 @@ if test x$enable_doxygen_docs = xyes; then fi fi +if test x$dbus_win = xno; then + DBUS_GENERATE_MAN=YES +else + DBUS_GENERATE_MAN=NO +fi +AC_SUBST([DBUS_GENERATE_MAN]) + AM_CONDITIONAL(DBUS_DOXYGEN_DOCS_ENABLED, test x$enable_doxygen_docs = xyes) AC_MSG_RESULT($enable_doxygen_docs) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 25fd7c30..5a5eb85a 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -12,6 +12,11 @@ endif() if(DBUS_ENABLE_DOXYGEN_DOCS) set(top_srcdir ${CMAKE_SOURCE_DIR}) + if(WIN32) + set(DBUS_GENERATE_MAN NO) + else() + set(DBUS_GENERATE_MAN YES) + endif() configure_file(../Doxyfile.in ${CMAKE_BINARY_DIR}/Doxyfile ) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/api/html/index.html |