diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-02-13 09:42:26 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-02-13 09:42:26 +0000 |
| commit | ee957a428509da8f8896395262cae9a153b9316f (patch) | |
| tree | 9e33a3998ef52eef047b7641e1fde7d9f46d102c /doc | |
| parent | c63331a303a15aeb1c38b0bab546ff47a41b8335 (diff) | |
Integrate some more diffs from the 1.5 branch
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/CMakeLists.txt | 18 |
1 files 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) |