Revision: 45817
http://brlcad.svn.sourceforge.net/brlcad/?rev=45817&view=rev
Author: brlcad
Date: 2011-08-08 19:38:31 +0000 (Mon, 08 Aug 2011)
Log Message:
-----------
the Doxygen paths are already relative, so no need to auto-generate the file
with full-paths shoved in. write out to the doc dir.
Modified Paths:
--------------
brlcad/trunk/misc/CMakeLists.txt
brlcad/trunk/misc/Makefile.am
Modified: brlcad/trunk/misc/CMakeLists.txt
===================================================================
--- brlcad/trunk/misc/CMakeLists.txt 2011-08-08 19:12:29 UTC (rev 45816)
+++ brlcad/trunk/misc/CMakeLists.txt 2011-08-08 19:38:31 UTC (rev 45817)
@@ -35,12 +35,11 @@
find_package(Doxygen)
IF(DOXYGEN_FOUND)
- configure_file(Doxyfile.in ${CMAKE_BINARY_DIR}/misc/Doxyfile)
IF(BRLCAD-BUILD_DOXYGEN_DOCS)
ADD_CUSTOM_COMMAND(
- OUTPUT
${CMAKE_BINARY_DIR}/misc/doxygen_output/html/index.html
- COMMAND ${DOXYGEN_EXECUTABLE}
${CMAKE_BINARY_DIR}/misc/Doxyfile
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ OUTPUT
${CMAKE_BINARY_DIR}/doc/doxygen_output/html/index.html
+ COMMAND ${DOXYGEN_EXECUTABLE}
${CMAKE_SOURCE_DIR}/misc/Doxyfile
+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/doc
)
ADD_CUSTOM_TARGET(dox DEPENDS
${CMAKE_BINARY_DIR}/misc/doxygen_output/html/index.html)
ENDIF(BRLCAD-BUILD_DOXYGEN_DOCS)
@@ -54,7 +53,6 @@
CMake
Description.txt
Doxyfile
- Doxyfile.in
Makefile.defs
archlinux
batch-indent-region.el
Modified: brlcad/trunk/misc/Makefile.am
===================================================================
--- brlcad/trunk/misc/Makefile.am 2011-08-08 19:12:29 UTC (rev 45816)
+++ brlcad/trunk/misc/Makefile.am 2011-08-08 19:38:31 UTC (rev 45817)
@@ -69,7 +69,6 @@
CMakeLists.txt \
Description.txt \
Doxyfile \
- Doxyfile.in \
Makefile.defs \
archlinux/PKGBUILD \
archlinux/brlcad.install \
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
BlackBerry® DevCon Americas, Oct. 18-20, San Francisco, CA
The must-attend event for mobile developers. Connect with experts.
Get tools for creating Super Apps. See the latest technologies.
Sessions, hands-on labs, demos & much more. Register early & save!
http://p.sf.net/sfu/rim-blackberry-1
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
