[Boost-commit] svn:boost r52253 - trunk/tools/build/CMake

Subject: [Boost-commit] svn:boost r52253 - trunk/tools/build/CMake
From: troy_at_[hidden]
Date: 2009-04-08 09:14:15

Author: troy
Date: 2009-04-08 09:14:14 EDT (Wed, 08 Apr 2009)
New Revision: 52253
URL: http://svn.boost.org/trac/boost/changeset/52253

Log:

Silly BUILD_QUICKBOOK.  Just use the cmake target.

Also check for headers to feed to doxygen in both regular and
modularized locations.

Text files modified: 
   trunk/tools/build/CMake/BoostDocs.cmake |    37 ++++++++++++++++++++-----------------   
   1 files changed, 20 insertions(+), 17 deletions(-)

Modified: trunk/tools/build/CMake/BoostDocs.cmake
==============================================================================
--- trunk/tools/build/CMake/BoostDocs.cmake	(original)
+++ trunk/tools/build/CMake/BoostDocs.cmake	2009-04-08 09:14:14 EDT (Wed, 08 Apr 2009)
@@ -166,12 +166,20 @@
     file(APPEND ${DOXYFILE} "${PARAM}\n")
   endforeach(PARAM)
 
-  set(THIS_DOXY_HEADER_PATH ${CMAKE_SOURCE_DIR}/libs/${libname}/include)
+  set(THIS_DOXY_MODULAR_HEADER_PATH ${CMAKE_SOURCE_DIR}/libs/${libname}/include)
 
   set(THIS_DOXY_HEADER_LIST "")
   set(THIS_DOXY_HEADERS)
   foreach(HDR ${THIS_DOXY_DEFAULT_ARGS})
-    list(APPEND THIS_DOXY_HEADERS ${THIS_DOXY_HEADER_PATH}/${HDR})
+    if(EXISTS ${CMAKE_SOURCE_DIR}/${HDR})
+      list(APPEND THIS_DOXY_HEADERS ${CMAKE_SOURCE_DIR}/${HDR})
+    elseif(EXISTS ${THIS_DOXY_MODULAR_HEADER_PATH}/${HDR})
+      list(APPEND THIS_DOXY_HEADERS ${THIS_DOXY_MODULAR_HEADER_PATH}/${HDR})
+    else(EXISTS ${CMAKE_SOURCE_DIR}/${HDR})
+      message("Warning: Attempting to generate doxygen to boostbook target for header ${HDR},")  
+      message("         which was not found in the main source directory or in a modularized location")
+    endif(EXISTS ${CMAKE_SOURCE_DIR}/${HDR})
+
     set(THIS_DOXY_HEADER_LIST 
       "${THIS_DOXY_HEADER_LIST} ${THIS_DOXY_HEADER_PATH}/${HDR}")
   endforeach(HDR)
@@ -278,22 +286,17 @@
   get_filename_component(THIS_DOC_EXT ${SOURCE} EXT)
   string(TOUPPER ${THIS_DOC_EXT} THIS_DOC_EXT)
   if (THIS_DOC_EXT STREQUAL ".QBK")
-    if (BUILD_QUICKBOOK)
-      # Transform Quickbook into BoostBook XML
-      get_filename_component(SOURCE_FILENAME ${SOURCE} NAME_WE)
-      set(BOOSTBOOK_FILE ${SOURCE_FILENAME}.xml)
-      add_custom_command(OUTPUT ${BOOSTBOOK_FILE}
-        COMMAND quickbook "--output-file=${BOOSTBOOK_FILE}"
-        ${THIS_DOC_SOURCE_PATH} 
-        DEPENDS ${THIS_DOC_SOURCE_PATH} ${THIS_DOC_DEFAULT_ARGS}
-        COMMENT "Generating BoostBook documentation for Boost.${PROJECT_NAME}...")
+    # Transform Quickbook into BoostBook XML
+    get_filename_component(SOURCE_FILENAME ${SOURCE} NAME_WE)
+    set(BOOSTBOOK_FILE ${SOURCE_FILENAME}.xml)
+    add_custom_command(OUTPUT ${BOOSTBOOK_FILE}
+      COMMAND quickbook "--output-file=${BOOSTBOOK_FILE}"
+      ${THIS_DOC_SOURCE_PATH} 
+      DEPENDS ${THIS_DOC_SOURCE_PATH} ${THIS_DOC_DEFAULT_ARGS}
+      COMMENT "Generating BoostBook documentation for Boost.${PROJECT_NAME}...")
 
-      # Transform BoostBook into other formats
-      boost_add_documentation(${CMAKE_CURRENT_BINARY_DIR}/${BOOSTBOOK_FILE})
-    else()
-      message(SEND_ERROR 
-        "Quickbook is required to build Boost documentation.\nQuickbook can be built by enabling the BUILD_QUICKBOOK.")
-    endif()
+    # Transform BoostBook into other formats
+    boost_add_documentation(${CMAKE_CURRENT_BINARY_DIR}/${BOOSTBOOK_FILE})
   elseif (THIS_DOC_EXT STREQUAL ".XML")
     # Transform BoostBook XML into DocBook XML
     get_filename_component(SOURCE_FILENAME ${SOURCE} NAME_WE)