summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMathieu Malaterre <mathieu.malaterre@gmail.com>2012-02-13 09:27:50 +0000
committerMathieu Malaterre <mathieu.malaterre@gmail.com>2012-02-13 09:27:50 +0000
commitc63331a303a15aeb1c38b0bab546ff47a41b8335 (patch)
treee05f15e8afdcc6faaf6cde6aba5bba05c57f2dd2 /doc
parent4d2c44ca8713367e4ecabe89df8f9a15375efcfe (diff)
Start merging of the 1.5 branch into trunk. Start with doc
Diffstat (limited to 'doc')
-rw-r--r--doc/Doxyfile.dox.cmake.in (renamed from doc/Doxyfile-html.dox.cmake)4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/Doxyfile-html.dox.cmake b/doc/Doxyfile.dox.cmake.in
index 0c4a4ff5..1bd970e8 100644
--- a/doc/Doxyfile-html.dox.cmake
+++ b/doc/Doxyfile.dox.cmake.in
@@ -5,10 +5,10 @@
#---------------------------------------------------------------------------
DOXYFILE_ENCODING = UTF-8
PROJECT_NAME = OpenJPEG
-PROJECT_NUMBER =
+PROJECT_NUMBER = @OPENJPEG_VERSION@
PROJECT_BRIEF =
PROJECT_LOGO =
-OUTPUT_DIRECTORY = .
+OUTPUT_DIRECTORY = @OPENJPEG_BINARY_DIR@/doc
CREATE_SUBDIRS = NO
OUTPUT_LANGUAGE = English
BRIEF_MEMBER_DESC = YES