Subject: [Boost-commit] svn:boost r52798 - branches/release/tools/build/CMake
From: troy_at_[hidden]
Date: 2009-05-06 06:43:39
Author: troy
Date: 2009-05-06 06:43:38 EDT (Wed, 06 May 2009)
New Revision: 52798
URL: http://svn.boost.org/trac/boost/changeset/52798
Log:
Docs build tweaks
Text files modified:
branches/release/tools/build/CMake/BoostDocs.cmake | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
Modified: branches/release/tools/build/CMake/BoostDocs.cmake
==============================================================================
--- branches/release/tools/build/CMake/BoostDocs.cmake (original)
+++ branches/release/tools/build/CMake/BoostDocs.cmake 2009-05-06 06:43:38 EDT (Wed, 06 May 2009)
@@ -118,6 +118,9 @@
elseif(THIS_XSL_MAKE_TARGET)
add_custom_target(${THIS_XSL_MAKE_TARGET}
DEPENDS ${THIS_XSL_OUTPUT_FILE})
+ set_target_properties(${THIS_XSL_MAKE_TARGET}
+ PROPERTIES
+ EXCLUDE_FROM_ALL ON)
endif()
endif()
endmacro(xsl_transform)
@@ -319,9 +322,14 @@
PARAMETERS admon.graphics.path=images
navig.graphics.path=images
boost.image.src=boost.png
- COMMENT "Generating HTML documentation for Boost.${PROJECT_NAME}..."
+ COMMENT "Generating HTML documentaiton for Boost.${PROJECT_NAME}..."
MAKE_TARGET ${PROJECT_NAME}-html)
+ add_custom_command(TARGET ${PROJECT_NAME}-html
+ POST_BUILD
+ COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/doc/src/boostbook.css ${CMAKE_CURRENT_BINARY_DIR}/html
+ COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/boost.png ${CMAKE_CURRENT_BINARY_DIR}/html
+ )
# Install generated documentation
install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html
DESTINATION share/boost-${BOOST_VERSION}
@@ -338,7 +346,7 @@
CATALOG ${CMAKE_BINARY_DIR}/catalog.xml
DIRECTORY man.manifest
COMMENT "Generating man pages for Boost.${PROJECT_NAME}..."
- MAKE_ALL_TARGET ${PROJECT_NAME}-man)
+ MAKE_TARGET ${PROJECT_NAME}-man)
# Install man pages
install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man
@@ -501,12 +509,18 @@
set(BUILD_DOCUMENTATION_OKAY TRUE)
if (NOT XSLTPROC)
set(BUILD_DOCUMENTATION_OKAY FALSE)
+ message(STATUS "Docs build disabled due to missing xsltproc")
elseif (NOT DOXYGEN)
set(BUILD_DOCUMENTATION_OKAY FALSE)
+ message(STATUS "Docs build disabled due to missing doxygen")
elseif (NOT DOCBOOK_DTD_DIR)
set(BUILD_DOCUMENTATION_OKAY FALSE)
+ message(STATUS "Docs build disabled due to missing docbook dtd dir")
+ message(STATUS "You can set DOCBOOK_AUTOCONFIG to attempt this automatically.")
elseif (NOT DOCBOOK_XSL_DIR)
set(BUILD_DOCUMENTATION_OKAY FALSE)
+ message(STATUS "Docs build disabled due to missing docbook xsl dir")
+ message(STATUS "You can set DOCBOOK_AUTOCONFIG to attempt this automatically.")
else()
set(BUILD_DOCUMENTATION_OKAY TRUE)
endif()