From b2c5466c96f4cc1ae92a9e089b9d067be45cd1a3 Mon Sep 17 00:00:00 2001
From: Ian Rees <ian.rees@gmail.com>
Date: Sun, 15 Oct 2017 14:11:29 +1300
Subject: [PATCH] Fix LaTeX include used for Doxygen docs

---
 src/Doc/BuildDevDoc.cfg.in |  2 +-
 src/Doc/BuildWebDoc.cfg.in |  2 +-
 src/Doc/CMakeLists.txt     | 66 ++++++++++----------------------------
 3 files changed, 19 insertions(+), 51 deletions(-)

diff --git a/src/Doc/BuildDevDoc.cfg.in b/src/Doc/BuildDevDoc.cfg.in
index 11f437997d..eb96d7c4dd 100644
--- a/src/Doc/BuildDevDoc.cfg.in
+++ b/src/Doc/BuildDevDoc.cfg.in
@@ -1145,7 +1145,7 @@ PAPER_TYPE             = a4wide
 # The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
 # packages that should be included in the LaTeX output.
 
-EXTRA_PACKAGES         =
+EXTRA_PACKAGES         = amsmath
 
 # The LATEX_HEADER tag can be used to specify a personal LaTeX header for
 # the generated latex document. The header should contain everything until
diff --git a/src/Doc/BuildWebDoc.cfg.in b/src/Doc/BuildWebDoc.cfg.in
index dcec68aa6d..428479674e 100644
--- a/src/Doc/BuildWebDoc.cfg.in
+++ b/src/Doc/BuildWebDoc.cfg.in
@@ -1155,7 +1155,7 @@ PAPER_TYPE             = a4wide
 # The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
 # packages that should be included in the LaTeX output.
 
-EXTRA_PACKAGES         =
+EXTRA_PACKAGES         = amsmath
 
 # The LATEX_HEADER tag can be used to specify a personal LaTeX header for
 # the generated latex document. The header should contain everything until
diff --git a/src/Doc/CMakeLists.txt b/src/Doc/CMakeLists.txt
index 7e3ef8bfdd..7308d27fed 100644
--- a/src/Doc/CMakeLists.txt
+++ b/src/Doc/CMakeLists.txt
@@ -85,57 +85,25 @@ if(DOXYGEN_FOUND)
                    ${CMAKE_CURRENT_BINARY_DIR}/BuildDevDoc.cfg @ONLY)
     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/BuildWebDoc.cfg.in  
                    ${CMAKE_CURRENT_BINARY_DIR}/BuildWebDoc.cfg @ONLY)
-                
-    if( FREECAD_MAINTAINERS_BUILD )
-        if (WIN32)
-        ADD_CUSTOM_TARGET(SourceDocu 
-            ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/BuildDevDoc.cfg 
-            if(QT_HELPCOMPILER_EXECUTABLE)
-                COMMAND ${QT_HELPCOMPILER_EXECUTABLE} ${CMAKE_BINARY_DIR}/doc/SourceDocu/html/index.qhp
-                COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/doc/SourceDocu/html/index.qch ${CMAKE_BINARY_DIR}/doc/FreeCADSource.qch
-            endif(QT_HELPCOMPILER_EXECUTABLE)    
-            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-            DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/BuildDevDoc.cfg
-        )
-        else(WIN32)
-        ADD_CUSTOM_TARGET(SourceDocu 
-            ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/BuildDevDoc.cfg 
-            COMMAND ${QT_HELPCOMPILER_EXECUTABLE} "${CMAKE_BINARY_DIR}/doc/SourceDocu/html/index.qhp"
-            COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/doc/SourceDocu/html/index.qch ${CMAKE_BINARY_DIR}/doc/FreeCADSource.qch
-            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-            DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/BuildDevDoc.cfg
-        )
-        endif(WIN32)
-
-        ADD_CUSTOM_TARGET(UserDocu 
-            ${PYTHON_EXECUTABLE} 
-            ${CMAKE_SOURCE_DIR}/src/Tools/wiki2qhelp.py 
-         -c ${QT_HELPCOMPILER_EXECUTABLE}   
-         -g ${QT_COLLECTIOMGENERATOR_EXECUTABLE}   
-         -o ${CMAKE_BINARY_DIR}/doc   
-        )
-
-    else( FREECAD_MAINTAINERS_BUILD )
  
-        # reconfigure to have all sources files generated from xml, whatever build options were
-        # generate source documentation
-        # delete CMakeCache to reset to default build options next time 
-        ADD_CUSTOM_TARGET(DevDoc
-            ${CMAKE_COMMAND} -D BUILD_GUI:BOOL=ON -D BUILD_FEM:BOOL=ON ${CMAKE_SOURCE_DIR}
-            COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/BuildDevDoc.cfg
-            COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_BINARY_DIR}/CMakeCache.txt
-            WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-        )
-        # lightweight version for the web
-        ADD_CUSTOM_TARGET(WebDoc
-            ${CMAKE_COMMAND} -D BUILD_GUI:BOOL=ON -D BUILD_FEM:BOOL=ON ${CMAKE_SOURCE_DIR}
-            COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/src/Doc/templates ${CMAKE_CURRENT_BINARY_DIR}/templates
-            COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/BuildWebDoc.cfg
-            COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_BINARY_DIR}/CMakeCache.txt
-            WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-        )
+    # reconfigure to have all sources files generated from xml, whatever build options were
+    # generate source documentation
+    # delete CMakeCache to reset to default build options next time 
+    ADD_CUSTOM_TARGET(DevDoc
+        ${CMAKE_COMMAND} -D BUILD_GUI:BOOL=ON -D BUILD_FEM:BOOL=ON ${CMAKE_SOURCE_DIR}
+        COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/BuildDevDoc.cfg
+        COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_BINARY_DIR}/CMakeCache.txt
+        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+    )
+    # lightweight version for the web
+    ADD_CUSTOM_TARGET(WebDoc
+        ${CMAKE_COMMAND} -D BUILD_GUI:BOOL=ON -D BUILD_FEM:BOOL=ON ${CMAKE_SOURCE_DIR}
+        COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/src/Doc/templates ${CMAKE_CURRENT_BINARY_DIR}/templates
+        COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/BuildWebDoc.cfg
+        COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_BINARY_DIR}/CMakeCache.txt
+        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+    )
 
-    endif( FREECAD_MAINTAINERS_BUILD )
 else( DOXYGEN_FOUND )
     ADD_CUSTOM_TARGET(DevDoc
                       echo "Doxygen not found.  Install it and rerun CMake")