[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[vidalia-svn] r3739: Tweak the Doxygen config so it can be run from the build dir (vidalia/trunk/doc)



Author: edmanm
Date: 2009-04-28 19:27:12 -0400 (Tue, 28 Apr 2009)
New Revision: 3739

Modified:
   vidalia/trunk/doc/CMakeLists.txt
   vidalia/trunk/doc/Doxyfile.in
Log:

Tweak the Doxygen config so it can be run from the build dir, and add a
'make doxygen' build target that exists if Doxygen is installed.


Modified: vidalia/trunk/doc/CMakeLists.txt
===================================================================
--- vidalia/trunk/doc/CMakeLists.txt	2009-04-28 21:39:08 UTC (rev 3738)
+++ vidalia/trunk/doc/CMakeLists.txt	2009-04-28 23:27:12 UTC (rev 3739)
@@ -15,8 +15,18 @@
   ${CMAKE_CURRENT_SOURCE_DIR}/vidalia.1.in
   ${CMAKE_CURRENT_SOURCE_DIR}/vidalia.1
 )
+
+set(DOXYGEN_INPUT_DIR ${Vidalia_SOURCE_DIR})
+set(DOXYGEN_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR})
 configure_file(
   ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in
-  ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile
+  ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
 )
 
+include(FindDoxygen)
+if (DOXYGEN_FOUND)
+  add_custom_target(doxygen
+    COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
+  )
+endif(DOXYGEN_FOUND)
+

Modified: vidalia/trunk/doc/Doxyfile.in
===================================================================
--- vidalia/trunk/doc/Doxyfile.in	2009-04-28 21:39:08 UTC (rev 3738)
+++ vidalia/trunk/doc/Doxyfile.in	2009-04-28 23:27:12 UTC (rev 3739)
@@ -5,7 +5,7 @@
 #---------------------------------------------------------------------------
 PROJECT_NAME           = Vidalia
 PROJECT_NUMBER         = @VERSION@
-OUTPUT_DIRECTORY       = ./
+OUTPUT_DIRECTORY       = @DOXYGEN_OUTPUT_DIR@
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English
 USE_WINDOWS_ENCODING   = NO
@@ -82,7 +82,7 @@
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
-INPUT                  = ../src
+INPUT                  = @DOXYGEN_INPUT_DIR@
 FILE_PATTERNS          = *.cpp \
                          *.h
 RECURSIVE              = YES