ENH: Add CMake/doxygen output

diff --git a/CMakeLists.txt b/CMakeLists.txt
index efa6475c4fa8b48dfc52ea448fd7b6389d238b4f..a7a3e3b28fdfdf2869c043a6d74549f7adf12420 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,6 +72,13 @@ IF(BUILD_EXAMPLES)
   SUBDIRS(codec)
 ENDIF(BUILD_EXAMPLES)
 
+#-----------------------------------------------------------------------------
+# For the documentation
+OPTION(BUILD_DOCUMENTATION "Build the doxygen documentation" OFF)
+IF(BUILD_DOCUMENTATION)
+  SUBDIRS(doc)
+ENDIF(BUILD_DOCUMENTATION)
+
 #-----------------------------------------------------------------------------
 # For openjpeg team if they ever want Dart+CMake
 IF(OPJ_STANDALONE)

diff --git a/ChangeLog b/ChangeLog
index 211b0d7b6432a57ec02af1284bc7b1e3f7b44c24..16b8029dfbedbc1784fd6065bc874d916cf0bf88 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,7 @@ September 6, 2007
 * [Mathieu Malaterre] CMake: start compiling index_create
 * [Mathieu Malaterre] OpenJPEG.rc update copyright year
 * [Mathieu Malaterre] CMake: add Java j2kviewer but do not compile it using cmake since cmake has too poor support for Java. Should create a custom command running ant instead.
+* [Mathieu Malaterre] CMake: Add doxygen output
 
 September 4, 2007
 + [GB] Added some fields in the codestream_info structure: they are used to record the position of single tile parts. Changed also the write_index function in the codec, to reflect the presence of this new information.

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
new file mode 100644 (file)
index 0000000..01eeeb7
--- /dev/null
+++ b/doc/CMakeLists.txt
@@ -0,0 +1,12 @@
+FIND_PACKAGE(Doxygen REQUIRED)
+
+# The Doxyfile.dox is poorly defined and produce output
+# in the source dir
+ADD_CUSTOM_TARGET(doxygen
+# By default doxygen target is added to the 'all' target. Project is small
+# thus running doxygen is not too time consuming
+  ALL
+  ${DOXYGEN}
+  ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.dox
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+)