From ec8c4f2c5cf55d8dc53e0dff5666f3f7c5be0d76 Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Fri, 7 Sep 2012 14:03:18 +0200
Subject: [PATCH] 0000817: make DevDoc fails

---
 src/CMakeLists.txt     | 5 +----
 src/Doc/CMakeLists.txt | 8 ++++----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6d440389f..555abac59 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -16,14 +16,11 @@ if(FREECAD_BUILD_TEMPLATE)
 	add_subdirectory(Tools/_TEMPLATE_)
 endif(FREECAD_BUILD_TEMPLATE)
 
-if(FREECAD_MAINTAINERS_BUILD)
-	add_subdirectory(Doc)
-endif(FREECAD_MAINTAINERS_BUILD)
+add_subdirectory(Doc)
 
 if(FREECAD_MAINTAINERS_BUILD AND WIN32)
 	#add_subdirectory(WindowsInstaller)
 endif(FREECAD_MAINTAINERS_BUILD AND WIN32)
-
 INSTALL(FILES Doc/Start_Page.html Doc/freecad.qhc Doc/freecad.qch
     DESTINATION ${CMAKE_INSTALL_DOCDIR}
 )
diff --git a/src/Doc/CMakeLists.txt b/src/Doc/CMakeLists.txt
index 46fdb57b0..f2639f2a7 100644
--- a/src/Doc/CMakeLists.txt
+++ b/src/Doc/CMakeLists.txt
@@ -49,7 +49,7 @@ if(DOXYGEN_FOUND)
 
     STRING(REGEX REPLACE ";" " " DOXYGEN_EXCLUDE_LIST "${DOXYGEN_EXCLUDE_DIR}")
 
-    SET(DOXYGEN_OUTPUT_DIR ${CMAKE_BINARY_DIR}/Doc/SourceDocu)
+    SET(DOXYGEN_OUTPUT_DIR ${CMAKE_BINARY_DIR}/doc/SourceDocu)
     SET(DOXYGEN_IMAGE_PATH ${CMAKE_SOURCE_DIR}/src/Gui/Icons)
     SET(DOXYGEN_LAYOUT_FILE ${CMAKE_SOURCE_DIR}/src/Doc/FreecadDoxygenLayout.xml)
 
@@ -66,8 +66,8 @@ if(DOXYGEN_FOUND)
     if( FREECAD_MAINTAINERS_BUILD )
         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
+            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
         )
@@ -77,7 +77,7 @@ if(DOXYGEN_FOUND)
             ${CMAKE_SOURCE_DIR}/src/Tools/wiki2qhelp.py 
          -c ${QT_HELPCOMPILER_EXECUTABLE}   
          -g ${QT_COLLECTIOMGENERATOR_EXECUTABLE}   
-         -o ${CMAKE_BINARY_DIR}/Doc   
+         -o ${CMAKE_BINARY_DIR}/doc   
         )
 
     else( FREECAD_MAINTAINERS_BUILD )