minor changes in cmake flags

3 files changed, 33 insertions, 23 deletions

diff --git a/CHANGES b/CHANGES
index d9a91813..599c1d80 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,9 @@ What's New for OpenJPEG
 ! : changed
 + : added
 
+November 16, 2010
+! [antonin] minor changes in cmake flags
+
 November 15, 2010
 ! [antonin] xcode project rewrite.
 ! [antonin] changed imagetopng() function to correctly deal with non-standard bit-depths. Add png support for win32. (from winfried)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 98880ac3..eeaeaba7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -153,23 +153,21 @@ ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/openjpeg_mangle.h.in)
 #-----------------------------------------------------------------------------
 # Always build the library
 INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
-SUBDIRS(
-  libopenjpeg
-  mj2
-  )
-
-IF(NOT UNIX)
-SUBDIRS(
-  indexer_JPIP
-  )
-ENDIF(NOT UNIX)
+SUBDIRS(libopenjpeg)
 
 #-----------------------------------------------------------------------------
-# Build example codec ?
-OPTION(BUILD_EXAMPLES "Build the Examples (codec...)." ON)
-IF(BUILD_EXAMPLES)
+# Build CODEC binaries ?
+OPTION(BUILD_CODEC "Build the CODEC binaries" ON)
+IF(BUILD_CODEC)
   SUBDIRS(codec)
-ENDIF(BUILD_EXAMPLES)
+ENDIF(BUILD_CODEC)
+
+#-----------------------------------------------------------------------------
+# Build MJ2 binaries ?
+OPTION(BUILD_MJ2 "Build the MJ2 binaries." ON)
+IF(BUILD_MJ2)
+  SUBDIRS(mj2)
+ENDIF(BUILD_MJ2)
 
 #-----------------------------------------------------------------------------
 # Build JPWL binaries ?
@@ -186,11 +184,18 @@ IF(BUILD_JP3D)
 ENDIF(BUILD_JP3D)
 
 #-----------------------------------------------------------------------------
-# Build documentation ?
-OPTION(BUILD_DOCUMENTATION "Build the doxygen documentation" OFF)
-IF(BUILD_DOCUMENTATION)
+# Build INDEXER_JPIP binaries ?
+OPTION(BUILD_INDEXER_JPIP "Build the INDEXER_JPIP binaries" OFF)
+IF(BUILD_INDEXER_JPIP AND NOT UNIX)
+  SUBDIRS(indexer_JPIP)
+ENDIF(BUILD_INDEXER_JPIP)
+
+#-----------------------------------------------------------------------------
+# Build DOCUMENTATION ?
+OPTION(BUILD_DOC "Build the doxygen documentation" OFF)
+IF(BUILD_DOC)
   SUBDIRS(doc)
-ENDIF(BUILD_DOCUMENTATION)
+ENDIF(BUILD_DOC)
 
 #-----------------------------------------------------------------------------
 # For openjpeg team if they ever want CDash+CMake
diff --git a/INSTALL b/INSTALL
index 741acd4c..dfbcb394 100644
--- a/INSTALL
+++ b/INSTALL
@@ -54,11 +54,13 @@ Binaries are located in the 'bin' directory.
 
 Main available cmake flags:
 * To specify the install path: '-DCMAKE_INSTALL_PREFIX=/path'
-* To build the shared libraries: '-DBUILD_SHARED_LIBS:bool=on'
-* To build the example codec: '-DBUILD_EXAMPLES:bool=on' (default is actually 'ON')
-* To build the JPWL binaries: '-DBUILD_JPWL:bool=on'
-* To build the JP3D binaries: '-DBUILD_JP3D:bool=on'
-* To build the doxygen documentation: '-DBUILD_DOCUMENTATION:bool=on'
+* To build the shared libraries: '-DBUILD_SHARED_LIBS:bool=on' (default: 'ON')
+* To build the CODEC executables: '-DBUILD_CODEC:bool=on' (default: 'ON')
+* To build the MJ2 executables: '-DBUILD_MJ2:bool=on' (default: 'ON')
+* To build the JPWL executables and JPWL library: '-DBUILD_JPWL:bool=on' (default: 'OFF')
+* To build the JP3D executables and JP3D library: '-DBUILD_JP3D: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