X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=CMakeLists.txt;h=6147f271ed0a74de2176cb8f6469d3d856a89c41;hb=0264197f3f6d0946fa429758fb6ad70bf504ea95;hp=82a79ea070bb1558435e0e6b28dc250a6de6cc53;hpb=223a39b51e24c3efe565c4c3276bcbd8c3d4db4d;p=openjpeg.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 82a79ea0..6147f271 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -126,7 +126,7 @@ CONFIGURE_FILE(
 
 #-----------------------------------------------------------------------------
 # OpenJPEG build configuration options.
-OPTION(BUILD_SHARED_LIBS "Build OpenJPEG with shared libraries." ON)
+OPTION(BUILD_SHARED_LIBS "Build OpenJPEG shared library and link executables against it." ON)
 
 #-----------------------------------------------------------------------------
 SET (EXECUTABLE_OUTPUT_PATH ${OPENJPEG_BINARY_DIR}/bin CACHE PATH "Single output directory for building all executables.")
@@ -149,36 +149,36 @@ INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
 SUBDIRS(libopenjpeg)
 
 #-----------------------------------------------------------------------------
-# Build CODEC binaries ?
-OPTION(BUILD_CODEC "Build the CODEC binaries" ON)
+# Build CODEC executables ?
+OPTION(BUILD_CODEC "Build the CODEC executables" ON)
 IF(BUILD_CODEC)
   SUBDIRS(codec)
 ENDIF(BUILD_CODEC)
 
 #-----------------------------------------------------------------------------
-# Build MJ2 binaries ?
-OPTION(BUILD_MJ2 "Build the MJ2 binaries." OFF)
+# Build MJ2 executables ?
+OPTION(BUILD_MJ2 "Build the MJ2 executables." OFF)
 IF(BUILD_MJ2)
   SUBDIRS(mj2)
 ENDIF(BUILD_MJ2)
 
 #-----------------------------------------------------------------------------
-# Build JPWL binaries ?
-OPTION(BUILD_JPWL "Build the JPWL binaries" OFF)
+# Build JPWL executables ?
+OPTION(BUILD_JPWL "Build the JPWL executables" OFF)
 IF(BUILD_JPWL)
   SUBDIRS(jpwl)
 ENDIF(BUILD_JPWL)
 
 #-----------------------------------------------------------------------------
-# Build JP3D binaries ?
-OPTION(BUILD_JP3D "Build the JP3D binaries" OFF)
+# Build JP3D executables ?
+OPTION(BUILD_JP3D "Build the JP3D executables" OFF)
 IF(BUILD_JP3D)
   SUBDIRS(jp3d)
 ENDIF(BUILD_JP3D)
 
 #-----------------------------------------------------------------------------
-# Build INDEXER_JPIP binaries ?
-OPTION(BUILD_INDEXER_JPIP "Build the INDEXER_JPIP binaries" OFF)
+# Build INDEXER_JPIP executables ?
+OPTION(BUILD_INDEXER_JPIP "Build the INDEXER_JPIP executables" OFF)
 IF(BUILD_INDEXER_JPIP AND NOT UNIX)
   SUBDIRS(indexer_JPIP)
 ENDIF(BUILD_INDEXER_JPIP AND NOT UNIX)
@@ -227,6 +227,11 @@ CONFIGURE_FILE( ${OPENJPEG_SOURCE_DIR}/CMake/OpenJPEGConfig.cmake.in
 INSTALL( FILES ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake
   DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR}
 )
+# install CHANGES and LICENSE
+INSTALL(
+  FILES       CHANGES 
+              LICENSE
+  DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
 #
 IF(UNIX OR CYGWIN)
   SET(CMAKE_INCLUDE_PATH /usr/include /usr/local/include /opt/include