fixed applications/codec/CMakeLists.txt that prevented JPWL executables to be built...

diff --git a/CHANGES b/CHANGES
index 119c1f3c1618291420b05c48c7542fe27412925a..d5e3dfd1cb6a04f9a9362b7e0a93d0e9083e9a01 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,10 @@ What's New for OpenJPEG
 ! : changed
 + : added
 
+April 14, 2011
+* [antonin] fixed applications/codec/CMakeLists.txt that prevented JPWL executables to be built with JPWL functionalities.
+! [antonin] changed make all behaviour : DOC target removed from ALL.
+
 April 13, 2011
 ! [antonin] changed the directory hierarchy of the whole project. See README files for details.
 ! [antonin] moved "openjpeg3d" directory from the trunk to the branches directory.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 474a5f0208f5312f194c401e0b70c16b6cd3e928..c4297e703d6f99bbd3b73129f7cc48cadc73b745 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -218,11 +218,8 @@ ADD_SUBDIRECTORY(applications)
 OPTION(BUILD_JPWL "Build the JPWL library and executables" OFF)
 
 #-----------------------------------------------------------------------------
-# Build DOCUMENTATION
-OPTION(BUILD_DOC "Build the doxygen documentation" OFF)
-IF(BUILD_DOC)
- ADD_SUBDIRECTORY(doc)
-ENDIF(BUILD_DOC)
+# Build DOCUMENTATION (not in ALL target and only if Doxygen is found)
+ADD_SUBDIRECTORY(doc)
 
 #-----------------------------------------------------------------------------
 # CDash+CMake : to be updated

diff --git a/INSTALL b/INSTALL
index bc26d76f8f792234e18afcb122291961c2eca54b..a3d97475257933d36b083e679ee0f775fe970c07 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -53,6 +53,10 @@ If you are root:
 else:
   sudo make install
   make clean
+  
+To build the Doxygen documentation (Doxygen needs to be found on the system):
+(A 'html' directory is generated in the 'doc' directory)
+  make doc
 
 Binaries are located in the 'bin' directory.
 
@@ -64,7 +68,6 @@ Main available cmake flags:
 * To build the MJ2 executables: '-DBUILD_MJ2:bool=on' (default: 'OFF')
 * To build the JPWL executables and JPWL library: '-DBUILD_JPWL:bool=on' (default: 'OFF')
 * [WIN32 ONLY] To build the INDEXER_JPIP executable: '-DBUILD_INDEXER_JPIP:bool=on' (default: 'OFF')
-* To build the doxygen documentation: '-DBUILD_DOC:bool=on' (default: 'OFF')
 * To enable testing (and automatic result upload to http://my.cdash.org/index.php?project=OPENJPEG):
     cmake . -DBUILD_TESTING:BOOL=ON -DJPEG2000_CONFORMANCE_DATA_ROOT:PATH=/path/to/your/JPEG2000/test/files
     make

diff --git a/applications/codec/CMakeLists.txt b/applications/codec/CMakeLists.txt
index 02d90fc544064c4a0a18849926a9eaac7bc19be7..37c8bb5dec60d623b0759f71430463545811a97d 100644 (file)
--- a/applications/codec/CMakeLists.txt
+++ b/applications/codec/CMakeLists.txt
@@ -66,10 +66,15 @@ IF(BUILD_JPWL)
   j2k_to_image.c
   ${common_SRCS}
   )
+  
+  SET_PROPERTY(
+     TARGET JPWL_j2k_to_image
+     APPEND PROPERTY COMPILE_DEFINITIONS USE_JPWL
+  )
 
   TARGET_LINK_LIBRARIES(JPWL_j2k_to_image ${OPENJPEG_LIBRARY_NAME}_JPWL
     ${LCMS_LIBNAME} ${Z_LIBNAME} ${PNG_LIBNAME} ${TIFF_LIBNAME})
-  #
+  
   IF(UNIX)
     TARGET_LINK_LIBRARIES(JPWL_j2k_to_image m)
   ENDIF(UNIX)
@@ -78,10 +83,15 @@ IF(BUILD_JPWL)
   image_to_j2k.c
   ${common_SRCS}
   )
+  
+  SET_PROPERTY(
+     TARGET JPWL_image_to_j2k
+     APPEND PROPERTY COMPILE_DEFINITIONS USE_JPWL
+  )
 
   TARGET_LINK_LIBRARIES(JPWL_image_to_j2k ${OPENJPEG_LIBRARY_NAME}_JPWL 
        ${LCMS_LIBNAME} ${Z_LIBNAME} ${PNG_LIBNAME} ${TIFF_LIBNAME})
-  #
+
   IF(UNIX)
     TARGET_LINK_LIBRARIES(JPWL_image_to_j2k m)
   ENDIF(UNIX)

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index aadbadbae5c33c3eb3e3bb7ecb7f9f3406e540eb..08741c64c2eb7df0f0d59df67c63eb95c334c5f0 100644 (file)
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -3,10 +3,7 @@ FIND_PACKAGE(Doxygen)
 IF(DOXYGEN_EXECUTABLE)
 # 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
+ADD_CUSTOM_TARGET(doc
   ${DOXYGEN}
   ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.dox
   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}