Hi Robert, On Tue, Dec 16, 2008 at 12:41 PM, Robert Osfield <[email protected]> wrote: > HI Mattias, > > I have gone ahead an merged your changes and checked them in. > > I have tried a make package_openscenegraph-doc but this hangs in much > the same way as the openscenegraph_source target does so it looks like > another cpack issue with in source builds. I will try an out of > source build to see how things pans out.
I just did an in source build make doc_openscenegraph make package_openscenegraph-doc it produced openscenegraph-doc-2.7.8.tar.gz which I unpacked in a different location and tested in firefox. What cmake version were you using? I have just tried the above with cmake-2.6.1 successfully. I also tried it with cmake-2.6.0. Here only targets "package" and "package_source" were generated. The reason is the old CPack.cmake (part of cmake suite) doesn't define the handy CPACK_COMPONENTS_ALL which i'm iterating to generate the various CPackConfig-xxx.cmake files. Perhaps the guard in the toplevel should be updated to reflect this? Or should I issue a warning? Mattias > > Robert. > > On Tue, Dec 16, 2008 at 11:24 AM, Robert Osfield > <[email protected]> wrote: >> HI Mattias, >> >> I've just integrated your changes but was a bit confused by the >> absence of the BUILD_DOCUMENTATION option, till I toggled on the >> advanced options in ccmake. I don't recall the exact details, but it >> might have been this reason why the BUILD_REF_DOCS was introduced. >> Can we tell CMake to not make this an advanced option? >> >> Robert. >> >> On Tue, Dec 16, 2008 at 2:27 AM, Mattias Helsing <[email protected]> wrote: >>> Hi Robert, all >>> >>> Added doc/Doxyfiles/openthreads.doxyfile.cmake >>> Updated all doxyfiles under doc/Doxyfiles. They are now all processed >>> by cmake but make targets are only generated for >>> OpenSceneGraphReferenceDocs and OpenThreadsReferenceDocs. The others >>> can be run with doxygen directly in <builddir>/doc. >>> Fixed a copy-paste in openthreads sproc and pthreads CMakeLists >>> Added the osg logo to the html footers >>> Added possibility to get generation of chm files. >>> >>> CMakeLists (toplevel): >>> Added install of osg and ot reference docs. This also generates >>> packaging targets of openscenegraph-doc and openthreads-doc if you >>> have packaging enabled >>> Removed the unused USING_OP_OT_TRIPLE_SET since there was no way of >>> enabling it anyway >>> Removed BUILD_REF_DOCS. IMO it was redundant - BUILD_DOCUMENTATION >>> does the same thing and we get that anyway from including >>> Documentation.cmake. >>> OsgCPack.cmake: >>> Removed generation of PACKAGE_SRC for msvc >>> Added special handling for -doc packaging targets - they don't require >>> system, architecture or compiler >>> >>> cheers >>> Mattias >>> >>> _______________________________________________ >>> osg-submissions mailing list >>> [email protected] >>> http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org >>> >>> >> > _______________________________________________ > osg-submissions mailing list > [email protected] > http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org > _______________________________________________ osg-submissions mailing list [email protected] http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org
