From ef47733ea173f7e9b2cb7cc5b5f8fbfb1283fd45 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 19 Dec 2008 11:04:35 +0000 Subject: [PATCH] From Mattias Helsing, " * Removed processing of include/OpenThreads in the OpenSceneGraph refman * Clears the mark_as_advanced property of the BUILD_DOCUMENTATION cmake variable (so it gets visible in simple view). " --- CMakeLists.txt | 4 ++-- doc/Doxyfiles/doxyfile.cmake | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1a1c6da7a..dc69de61d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -647,10 +647,10 @@ ADD_CUSTOM_TARGET(wrappers # For Doxygen INCLUDE(${CMAKE_ROOT}/Modules/Documentation.cmake OPTIONAL) OPTION(BUILD_DOCUMENTATION "Build OpenSceneGraph reference documentation using doxygen (use: make DoxygenDoc)" OFF) +MARK_AS_ADVANCED(CLEAR BUILD_DOCUMENTATION) # To build the documention, you will have to enable it # and then do the equivalent of "make DoxygenDoc". IF(BUILD_DOCUMENTATION) -# SET(BUILD_DOCUMENTATION YES) OPTION(BUILD_REF_DOCS_SEARCHENGINE "Enable doxygen's search engine (requires that documentation to be installed on a php enabled web server)" OFF) IF(BUILD_REF_DOCS_SEARCHENGINE) @@ -675,7 +675,7 @@ IF(BUILD_DOCUMENTATION) # If html help generation was requested. DOCUMENTATION_HTML_HELP is defined by Documentation.cmake SET(GENERATE_HTMLHELP "NO") IF(DOCUMENTATION_HTML_HELP) - # on win Documentation.cmake finds the html help workshop fi it exists. On u*ix we might have it with wine but no way to point it out + # on windows Documentation.cmake finds the html help workshop fi it exists. On u*ix we might have it with wine but no way to point it out IF(NOT WIN32) SET(HTML_HELP_COMPILER "" CACHE FILEPATH "Enter location of the HTML help compiler to let doxygen compile html") MARK_AS_ADVANCED(HTML_HELP_COMPILER) diff --git a/doc/Doxyfiles/doxyfile.cmake b/doc/Doxyfiles/doxyfile.cmake index 65de05bdd..437fc60d4 100644 --- a/doc/Doxyfiles/doxyfile.cmake +++ b/doc/Doxyfiles/doxyfile.cmake @@ -84,8 +84,7 @@ WARN_LOGFILE = #--------------------------------------------------------------------------- # configuration options related to the input files #--------------------------------------------------------------------------- -INPUT = "${OpenSceneGraph_SOURCE_DIR}/include/OpenThreads" \ - "${OpenSceneGraph_SOURCE_DIR}/include/osg" \ +INPUT = "${OpenSceneGraph_SOURCE_DIR}/include/osg" \ "${OpenSceneGraph_SOURCE_DIR}/include/osgDB" \ "${OpenSceneGraph_SOURCE_DIR}/include/osgFX" \ "${OpenSceneGraph_SOURCE_DIR}/include/osgGA" \