Fixed #2677 (XmlTo is now required for building?)

CMakeLists.txt

@@ -34,4 +34,3 @@ ELSE (MSVC_IDE)
 ENDIF (MSVC_IDE)
 
 ADD_SUBDIRECTORY(gui)
-ADD_SUBDIRECTORY(man)

cmake/modules/FindXmlTo.cmake

@@ -1,105 +0,0 @@
-# Is Hendrik Sattler the original author of the following script?
-# http://cmake.org/pipermail/cmake/2007-April/013545.html
-
-# - Convert XML docBook files to various formats
-# This will convert XML docBook files to various formats like:
-# man html txt dvi ps pdf
-#  macro XMLTO(outfiles infiles... MODES modes...)
-
-set ( XmlTo_FOUND false )
-
-find_program ( XMLTO_EXECUTABLE NAMES xmlto
-  DOC "path to the xmlto docbook xslt frontend" )
-
-if ( XMLTO_EXECUTABLE )
-  set ( XmlTo_FOUND true )
-
-  if ( NOT XmlTo_FIND_QUIETLY )
-     message ( STATUS "Found ${XMLTO_EXECUTABLE}" )
-  endif ( NOT XmlTo_FIND_QUIETLY )
-else ( XMLTO_EXECUTABLE )
-  if ( XmlTo_FIND_REQUIRED )
-     message ( FATAL_ERROR "The xmlto program was not found." )
-  endif ( XmlTo_FIND_REQUIRED )
-endif ( XMLTO_EXECUTABLE )
-
-macro ( _XMLTO_FILE outfiles mode)
-  #special settings
-  set ( XMLTO_FILEEXT_man 1 )
-  set ( XMLTO_MODE_html xhtml-nochunks )
-
-  if ( NOT XMLTO_MODE_${mode})
-    set ( XMLTO_MODE_${mode} ${mode} )
-  endif ( NOT XMLTO_MODE_${mode} )
-  if ( NOT XMLTO_FILEEXT_${mode} )
-    set ( XMLTO_FILEEXT_${mode} ${mode} )
-  endif ( NOT XMLTO_FILEEXT_${mode} )
-
-  foreach ( dbFile ${ARGN} )
-    #TODO: set XMLTO_FILEEXT_man to value from <manvolnum>
-    if ( "${mode}" STREQUAL "man" )
-      file ( READ "${dbFile}" _DB_FILE_CONTENTS )
-      string ( REGEX MATCH "<manvolnum>[^<]*" XMLTO_FILEEXT_${mode} "${_DB_FILE_CONTENTS}" )
-      string ( REGEX REPLACE "^<manvolnum>" "" XMLTO_FILEEXT_${mode} "${XMLTO_FILEEXT_${mode}}" )
-      string ( REGEX REPLACE "[[:space:]]" "" XMLTO_FILEEXT_${mode} "${XMLTO_FILEEXT_${mode}}" )
-    endif ( "${mode}" STREQUAL "man" )
-
-    get_filename_component ( dbFilePath "${CMAKE_CURRENT_BINARY_DIR}/${dbFile}" PATH )
-    get_filename_component ( dbFileWE "${dbFile}" NAME_WE )
-    get_filename_component ( dbFileAbsWE "${dbFilePath}/${dbFileWE}" ABSOLUTE )
-
-    add_custom_command (
-      OUTPUT            "${dbFileAbsWE}.${XMLTO_FILEEXT_${mode}}"
-      COMMAND           "${XMLTO_EXECUTABLE}" ${XMLTO_COMMAND_ARGS} -o "${CMAKE_CURRENT_BINARY_DIR}"
-                        ${XMLTO_MODE_${mode}} "${CMAKE_CURRENT_SOURCE_DIR}/${dbFile}"
-      MAIN_DEPENDENCY   "${CMAKE_CURRENT_SOURCE_DIR}/${dbFile}"
-      VERBATIM
-    )
-
-    set ( ${outfiles}
-      ${${outfiles}}
-      "${dbFileAbsWE}.${XMLTO_FILEEXT_${mode}}"
-    )
-  endforeach ( dbFile )
-endmacro ( _XMLTO_FILE outfiles )
-
-macro ( XMLTO )
-  set ( XMLTO_MODES )
-  set ( XMLTO_FILES )
-  set ( XMLTO_HAS_MODES false )
-  set ( XMLTO_ADD_DEFAULT false )
-  foreach ( arg ${ARGN} )
-    if ( ${arg} STREQUAL "MODES" )
-      set ( XMLTO_HAS_MODES true )
-    elseif ( ${arg} STREQUAL "ALL" )
-      set ( XMLTO_ADD_DEFAULT true )
-    else ( ${arg} STREQUAL "MODES" )
-      if ( XMLTO_HAS_MODES )
-	set ( XMLTO_MODES ${XMLTO_MODES} ${arg} )
-      else ( XMLTO_HAS_MODES )
-	set ( XMLTO_FILES ${XMLTO_FILES} ${arg} )
-      endif ( XMLTO_HAS_MODES )
-    endif ( ${arg} STREQUAL "MODES" )
-  endforeach ( arg ${ARGN} )
-  if ( NOT XMLTO_MODES )
-    set ( XMLTO_MODES html )
-  endif ( NOT XMLTO_MODES )
-
-  foreach ( mode ${XMLTO_MODES} )
-    _xmlto_file ( XMLTO_FILES_${mode} ${mode} ${XMLTO_FILES} )
-    if ( XMLTO_ADD_DEFAULT )
-      add_custom_target ( ${mode} ALL
-	DEPENDS ${XMLTO_FILES_${mode}}
-	VERBATIM
-      )
-    else ( XMLTO_ADD_DEFAULT )
-      add_custom_target ( ${mode}
-	DEPENDS ${XMLTO_FILES_${mode}}
-	VERBATIM
-      )
-    endif ( XMLTO_ADD_DEFAULT )
-  endforeach ( mode )
-
-  set ( XMLTO_MODES )
-  set ( XMLTO_FILES )
-endmacro ( XMLTO )

man/CMakeLists.txt

@@ -1,17 +0,0 @@
-# Build Docbook manual
-# Run 'make html' to build manual
-
-set(DOC_TARGETS "html")
-
-if(CYGWIN)
-   # Build also htmlhelp in Cygwin - this can be used to build
-   # htmlhelp manual for Windows.
-   set(DOC_TARGETS ${DOC_TARGETS} "htmlhelp")
-endif()
-
-if(UNIX OR CYGWIN)
-   # Build manual in Linux/Cygwin - xmlto is not available in Windows
-   # daniel: I don't want to have extra dependencies for Cppcheck
-   # find_package(XmlTo REQUIRED)
-   # xmlto("" "manual.docbook" MODES ${DOC_TARGETS})
-endif()