Subject: [Boost-commit] svn:boost r50934 - in trunk/tools: . build/CMake build/CMake/doc quickbook
From: troy_at_[hidden]
Date: 2009-01-31 15:25:16
Author: troy
Date: 2009-01-31 15:25:15 EST (Sat, 31 Jan 2009)
New Revision: 50934
URL: http://svn.boost.org/trac/boost/changeset/50934
Log:
Placeholder docs for cmake
Added:
trunk/tools/build/CMake/CMakeLists.txt (contents, props changed)
trunk/tools/build/CMake/doc/
trunk/tools/build/CMake/doc/CMakeLists.txt (contents, props changed)
trunk/tools/build/CMake/doc/cmake.qbk (contents, props changed)
Text files modified:
trunk/tools/CMakeLists.txt | 11 +++++--
trunk/tools/build/CMake/BoostDocs.cmake | 57 ++++++++++++++++++++++++++-------------
trunk/tools/quickbook/CMakeLists.txt | 16 +++++++++++
3 files changed, 62 insertions(+), 22 deletions(-)
Modified: trunk/tools/CMakeLists.txt
==============================================================================
--- trunk/tools/CMakeLists.txt (original)
+++ trunk/tools/CMakeLists.txt 2009-01-31 15:25:15 EST (Sat, 31 Jan 2009)
@@ -77,6 +77,11 @@
#
###############################################################################
-# add_subdirectory(quickbook)
-# add_subdirectory(wave)
-add_subdirectory(bcp)
\ No newline at end of file
+add_subdirectory(quickbook)
+add_subdirectory(wave)
+add_subdirectory(bcp)
+
+#
+# this one is just for docs
+#
+add_subdirectory(build/CMake)
Modified: trunk/tools/build/CMake/BoostDocs.cmake
==============================================================================
--- trunk/tools/build/CMake/BoostDocs.cmake (original)
+++ trunk/tools/build/CMake/BoostDocs.cmake 2009-01-31 15:25:15 EST (Sat, 31 Jan 2009)
@@ -322,6 +322,18 @@
COMMENT "Generating HTML documentation for Boost.${PROJECT_NAME}..."
MAKE_TARGET ${PROJECT_NAME}-html)
+ #
+ # Install associated stuff
+ #
+ 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/boostbook.css
+ COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/doc/src/docutils.css ${CMAKE_CURRENT_BINARY_DIR}/html/docutils.css
+ COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/doc/src/reference.css ${CMAKE_CURRENT_BINARY_DIR}/html/reference.css
+ COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/boost.png ${CMAKE_CURRENT_BINARY_DIR}/html/boost.png
+ COMMENT "Copying in associated stuff, boostbook.css and boost.png"
+ )
+
# Install generated documentation
install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html
DESTINATION share/boost-${BOOST_VERSION}
@@ -439,6 +451,9 @@
find_program(XSLTPROC xsltproc DOC "xsltproc transforms XML via XSLT")
set(XSLTPROC_FLAGS "--xinclude" CACHE STRING
"Flags to pass to xsltproc to transform XML documents")
+if(NOT XSLTPROC)
+ message(STATUS "xsltproc not found... this will disable build of documentation.")
+endif()
# Find the DocBook DTD (version 4.2)
find_path(DOCBOOK_DTD_DIR docbookx.dtd
@@ -496,25 +511,29 @@
endif()
endif()
-# Turn off BUILD_DOCUMENTATION if it isn't going to succeed.
-if (BUILD_DOCUMENTATION)
+set(BUILD_OCUMENTATION_OKAY TRUE)
+if (NOT XSLTPROC)
+ message(STATUS "XSLTPROC not found, disabling build of documentation")
+ set(BUILD_DOCUMENTATION_OKAY FALSE)
+elseif (NOT DOXYGEN)
+ message(STATUS "DOXYGEN not found, disabling build of documentation")
+ set(BUILD_DOCUMENTATION_OKAY FALSE)
+elseif (NOT DOCBOOK_DTD_DIR)
+ message(STATUS "DOCBOOK_DTD_DIR not found, disabling build of documentation")
+ message(STATUS "Set DOCBOOK_AUTOCONFIG to ON to get it automatically")
+ set(BUILD_DOCUMENTATION_OKAY FALSE)
+elseif (NOT DOCBOOK_XSL_DIR)
+ message(STATUS "DOCBOOK_XSL_DIR not found, disabling build of documentation")
+ message(STATUS "Set DOCBOOK_AUTOCONFIG to ON to get it automatically")
+ set(BUILD_DOCUMENTATION_OKAY FALSE)
+else()
+ message(STATUS "Documentation prerequisites found, enabling docs build.")
set(BUILD_DOCUMENTATION_OKAY TRUE)
- if (NOT XSLTPROC)
- set(BUILD_DOCUMENTATION_OKAY FALSE)
- elseif (NOT DOXYGEN)
- set(BUILD_DOCUMENTATION_OKAY FALSE)
- elseif (NOT DOCBOOK_DTD_DIR)
- set(BUILD_DOCUMENTATION_OKAY FALSE)
- elseif (NOT DOCBOOK_XSL_DIR)
- set(BUILD_DOCUMENTATION_OKAY FALSE)
- else()
- set(BUILD_DOCUMENTATION_OKAY TRUE)
- endif()
+endif()
- if (NOT BUILD_DOCUMENTATION_OKAY)
- if (BUILD_DOCUMENTATION)
- set(BUILD_DOCUMENTATION OFF CACHE BOOL
- "Whether to build library documentation" FORCE)
- endif()
+if (NOT BUILD_DOCUMENTATION_OKAY)
+ if (BUILD_DOCUMENTATION)
+ set(BUILD_DOCUMENTATION OFF CACHE BOOL
+ "Whether to build library documentation" FORCE)
endif()
-endif()
\ No newline at end of file
+endif()
Added: trunk/tools/build/CMake/CMakeLists.txt
==============================================================================
--- (empty file)
+++ trunk/tools/build/CMake/CMakeLists.txt 2009-01-31 15:25:15 EST (Sat, 31 Jan 2009)
@@ -0,0 +1,4 @@
+boost_library_project(cmake
+ DOCDIRS doc
+ )
+
Added: trunk/tools/build/CMake/doc/CMakeLists.txt
==============================================================================
--- (empty file)
+++ trunk/tools/build/CMake/doc/CMakeLists.txt 2009-01-31 15:25:15 EST (Sat, 31 Jan 2009)
@@ -0,0 +1,2 @@
+boost_add_documentation(cmake.qbk)
+
Added: trunk/tools/build/CMake/doc/cmake.qbk
==============================================================================
--- (empty file)
+++ trunk/tools/build/CMake/doc/cmake.qbk 2009-01-31 15:25:15 EST (Sat, 31 Jan 2009)
@@ -0,0 +1,23 @@
+[article Boost.CMake
+ [quickbook 1.3]
+ [authors [Gregor, Douglas], [Straszheim, Troy] ]
+ [copyright 2007, 2008, 2009 Douglas Gregor, Troy Straszheim]
+ [purpose
+ Building boost with cmake
+ ]
+ [id boost.cmake]
+ [dirname cmake]
+ [license
+ Distributed under the Boost Software License, Version 1.0.
+ (See accompanying file LICENSE_1_0.txt or copy at
+ <ulink url="http://www.boost.org/LICENSE_1_0.txt">
+ http://www.boost.org/LICENSE_1_0.txt
+ </ulink>)
+ ]
+]
+
+[section:intro Introduction]
+
+This is a placeholder for documentation of the cmake-based build system.
+
+[endsect]
Modified: trunk/tools/quickbook/CMakeLists.txt
==============================================================================
--- trunk/tools/quickbook/CMakeLists.txt (original)
+++ trunk/tools/quickbook/CMakeLists.txt 2009-01-31 15:25:15 EST (Sat, 31 Jan 2009)
@@ -8,6 +8,22 @@
add_definitions(/wd4511 /wd4512 /wd4701 /wd4702 /wd4244 /wd4267 /wd4800)
endif (MSVC)
+ #
+ # TDS: this needs fixing... these are the modules that quickbook is
+ # dependent on, these paths should be set via some more generic
+ # mechanism
+ #
+ include_directories(
+ ${CMAKE_SOURCE_DIR}/libs/spirit/include
+ ${CMAKE_SOURCE_DIR}/libs/detail/include
+ ${CMAKE_SOURCE_DIR}/libs/config/include
+ ${CMAKE_SOURCE_DIR}/libs/type_traits/include
+ ${CMAKE_SOURCE_DIR}/libs/program_options/include
+ ${CMAKE_SOURCE_DIR}/libs/filesystem/include
+ ${CMAKE_SOURCE_DIR}/libs/system/include
+ )
+
+
boost_add_executable(quickbook
detail/quickbook.cpp
detail/actions.cpp