[trunk] FolderReorgProposal task. Do not rebuild doxygen always

Update issue 177
This commit is contained in:
Mathieu Malaterre 2012-10-01 09:37:19 +00:00
parent 25cbfcf34a
commit aa6b4b4970
2 changed files with 22 additions and 22 deletions

25
NEWS
View File

@ -2,33 +2,20 @@
OpenJPEG NEWS - user visible changes OpenJPEG NEWS - user visible changes
==================================== ====================================
Changes from OpenJPEG 1.4.0 to OpenJPEG 1.5.0 Changes from OpenJPEG 1.5.x to OpenJPEG 2.0.0
---------------------------------------------- ----------------------------------------------
New Features: New Features:
* openjpip: * streaming capabilities
- complete client-server architecture for remote browsing of jpeg 2000 images. * merge JP3D
- located in 'applications/jpip'.
- see corresponding README for more details.
API modifications: API modifications:
* 'bool' type has been replaced by 'opj_bool' type. 'stdbool.h' is no more required. * Use a 64bits capable API
Misc: Misc:
* added this NEWS file. * removed autotools build system
* improved cmake and autotools build methods. * folders hierarchies reorganisation
* removed manual makefiles, VS project files and XCode project files.
* added a 'thirdparty' directory to contain all dependencies.
- These libraries will be build only if there are not found on the system.
- Note that libopenjpeg itself does not have any dependency.
* changed the directory hierarchy of the whole project. See README files for details.
* tests : a complete test suite has been setup.
- both JPEG 2000 conformance tests and non-regressions tests are configured.
- results are submitted to the OpenJPEG dashboard (http://my.cdash.org/index.php?project=OPENJPEG)
- images are located in 'http://openjpeg.googlecode.com/svn/data' folder.
- configuration files and utilities are located in 'tests' folder.
* OPJViewer re-activated (need wxWidgets)
* Huge amount of bug fixes. See CHANGES for details. * Huge amount of bug fixes. See CHANGES for details.

View File

@ -16,17 +16,30 @@ if(DOXYGEN_FOUND)
${CMAKE_BINARY_DIR}/doc/mainpage.dox @ONLY) ${CMAKE_BINARY_DIR}/doc/mainpage.dox @ONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/openjpip.dox.in configure_file(${CMAKE_CURRENT_SOURCE_DIR}/openjpip.dox.in
${CMAKE_BINARY_DIR}/doc/openjpip.dox @ONLY) ${CMAKE_BINARY_DIR}/doc/openjpip.dox @ONLY)
# copy png file to make local (binary tree) documentation valid:
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/jpip_architect.png configure_file(${CMAKE_CURRENT_SOURCE_DIR}/jpip_architect.png
${CMAKE_BINARY_DIR}/doc/html/jpip_architect.png COPYONLY) ${CMAKE_BINARY_DIR}/doc/html/jpip_architect.png COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/jpip_protocol.png configure_file(${CMAKE_CURRENT_SOURCE_DIR}/jpip_protocol.png
${CMAKE_BINARY_DIR}/doc/html/jpip_protocol.png COPYONLY) ${CMAKE_BINARY_DIR}/doc/html/jpip_protocol.png COPYONLY)
# Generate new target to build the html documentation # Generate new target to build the html documentation
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/html/index.html
COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_BINARY_DIR}/doc/Doxyfile-html.dox
DEPENDS ${CMAKE_BINARY_DIR}/doc/Doxyfile-html.dox
${CMAKE_BINARY_DIR}/doc/mainpage.dox
${CMAKE_BINARY_DIR}/doc/openjpip.dox
)
add_custom_target(doc ALL add_custom_target(doc ALL
${DOXYGEN_EXECUTABLE} ${CMAKE_BINARY_DIR}/doc/Doxyfile-html.dox) DEPENDS ${CMAKE_BINARY_DIR}/doc/html/index.html
COMMENT "Building doxygen documentation"
)
# install HTML documentation (install png files too):
install(DIRECTORY ${CMAKE_BINARY_DIR}/doc/html
DESTINATION share/doc
PATTERN ".svn" EXCLUDE
)
else() else()
message(STATUS "Doxygen not found, we cannot generate the documentation") message(STATUS "Doxygen not found, we cannot generate the documentation")
endif() endif()