From ee957a428509da8f8896395262cae9a153b9316f Mon Sep 17 00:00:00 2001 From: Mathieu Malaterre Date: Mon, 13 Feb 2012 09:42:26 +0000 Subject: [PATCH] Integrate some more diffs from the 1.5 branch --- doc/CMakeLists.txt | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index da8dd42e..71691927 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -1,21 +1,23 @@ -# Generate target to build the html documentatiop through CMake tool -# After configure the project with the BUILD_DOC option you can run make html +# Generate target to build the html documentation through CMake tool +# After having configured the project with the BUILD_DOC option you can run make doc # to generate the html documentation in the doc/html repository of the build folder. -CMAKE_MINIMUM_REQUIRED(VERSION 2.6) # Try to find the doxygen tool FIND_PACKAGE(Doxygen) IF(DOXYGEN_FOUND) - # Configure the doxygen config file with variable from CMake and move it - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile-html.dox.cmake ${CMAKE_BINARY_DIR}/doc/Doxyfile-html.dox @ONLY) + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.dox.cmake.in + ${CMAKE_BINARY_DIR}/doc/Doxyfile-html.dox @ONLY) - # Configure the html mainpage file of the doxygen documentation with variable from CMake and move it - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mainpage.dox.cmake ${CMAKE_BINARY_DIR}/doc/mainpage.dox) + # Configure the html mainpage file of the doxygen documentation with variable + # from CMake and move it + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mainpage.dox.cmake + ${CMAKE_BINARY_DIR}/doc/mainpage.dox @ONLY) # Generate new target to build the html documentation - ADD_CUSTOM_TARGET(html ${DOXYGEN_EXECUTABLE} ${CMAKE_BINARY_DIR}/doc/Doxyfile-html.dox) + ADD_CUSTOM_TARGET(doc ALL + ${DOXYGEN_EXECUTABLE} ${CMAKE_BINARY_DIR}/doc/Doxyfile-html.dox) ELSE(DOXYGEN_FOUND)