From: Ralf Habacker Date: Wed, 13 Mar 2019 09:13:09 +0000 (+0100) Subject: Do not let doxygen build man pages on Windows X-Git-Tag: dbus-1.13.10~14^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=760e30ec03d21d378890ff87eed91a81f040ba98;p=thirdparty%2Fdbus.git 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. --- diff --git a/Doxyfile.in b/Doxyfile.in index dbbdb4f74..b5bd51c9c 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 3b07e0c92..83b3eb727 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 25fd7c303..5a5eb85a2 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