summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Malaterre <mathieu.malaterre@gmail.com>2007-09-06 15:10:15 +0000
committerMathieu Malaterre <mathieu.malaterre@gmail.com>2007-09-06 15:10:15 +0000
commitcf95a80be6854be9f0455bb1275243dba091fd7a (patch)
tree603d175cb989b927de4607e48817dd7dd14945f0
parentbe5db9489e410523d93bdb41a60a08cac6a73938 (diff)
ENH: Add CMake/doxygen output
-rw-r--r--CMakeLists.txt7
-rw-r--r--ChangeLog1
-rw-r--r--doc/CMakeLists.txt12
3 files changed, 20 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index efa6475c..a7a3e3b2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -73,6 +73,13 @@ IF(BUILD_EXAMPLES)
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)
INCLUDE(Dart)
diff --git a/ChangeLog b/ChangeLog
index 211b0d7b..16b8029d 100644
--- 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
index 00000000..01eeeb79
--- /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}
+)