summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonin Descampe <antonin@gmail.com>2012-02-07 08:08:58 +0000
committerAntonin Descampe <antonin@gmail.com>2012-02-07 08:08:58 +0000
commit46da9f2294489b9c4b658605f934ecc298dc2d7a (patch)
tree318151fc0f7e80a18feec3400ee9d1ac3e08b9eb
parent995b145f09da886573a27710f16f78f9c2b2134f (diff)
[1.5] revert build documentation behaviour in cmake
-rw-r--r--CMakeLists.txt2
-rw-r--r--doc/CMakeLists.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6a602b80..61689ca5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -211,7 +211,7 @@ CONFIGURE_FILE("${OPENJPEG_SOURCE_DIR}/opj_config.h.cmake.in"
#-----------------------------------------------------------------------------
# Build DOCUMENTATION (not in ALL target and only if Doxygen is found)
-OPTION(BUILD_DOC "Build the HTML documentation (with doxygen if available)." ON)
+OPTION(BUILD_DOC "Build the HTML documentation (with doxygen if available)." OFF)
IF(BUILD_DOC)
ADD_SUBDIRECTORY(doc)
ENDIF(BUILD_DOC)
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 89ad74d8..0c00e31a 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -11,7 +11,7 @@ IF(DOXYGEN_FOUND)
${CMAKE_BINARY_DIR}/doc/Doxyfile-html.dox @ONLY)
# Generate new target to build the html documentation
- ADD_CUSTOM_TARGET(doc
+ ADD_CUSTOM_TARGET(doc ALL
${DOXYGEN_EXECUTABLE} ${CMAKE_BINARY_DIR}/doc/Doxyfile-html.dox)
ELSE(DOXYGEN_FOUND)