X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=CMakeLists.txt;h=61689ca56897a57c29f4bb428b16b2df79ca51c3;hb=040c9a68b685facb6e36751d1ff07b21cc8ded6d;hp=98880ac3866ec36a4586c982606ff2f2f290ff1d;hpb=bb9232c9d9d5e8ea3a2de36f20adac72c15127af;p=openjpeg.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 98880ac3..61689ca5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,25 +28,24 @@ INCLUDE_REGULAR_EXPRESSION("^.*$")
 #-----------------------------------------------------------------------------
 # OPENJPEG version number, useful for packaging and doxygen doc:
 SET(OPENJPEG_VERSION_MAJOR 1)
-SET(OPENJPEG_VERSION_MINOR 4)
+SET(OPENJPEG_VERSION_MINOR 5)
 SET(OPENJPEG_VERSION_BUILD 0)
 SET(OPENJPEG_VERSION
   "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}")
 SET(PACKAGE_VERSION
   "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}")
-# This setting of SOVERSION assumes that any API change
-# will increment either the minor or major version number of openjpeg
 SET(OPENJPEG_LIBRARY_PROPERTIES
   VERSION   "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}"
-  SOVERSION "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}"
+  SOVERSION "${OPENJPEG_VERSION_MAJOR}"
 )
-# You will also need to define a value for the following variables:
-# OPENJPEG_INSTALL_BIN_DIR          - binary dir (executables)
-# OPENJPEG_INSTALL_LIB_DIR          - library dir (libs)
-# OPENJPEG_INSTALL_DATA_DIR         - share dir (say, examples, data, etc)
-# OPENJPEG_INSTALL_INCLUDE_DIR      - include dir (headers)
 
+# --------------------------------------------------------------------------
+# Path to additional CMake modules
+SET(CMAKE_MODULE_PATH
+    ${CMAKE_SOURCE_DIR}/CMake
+    ${CMAKE_MODULE_PATH})
 
+# --------------------------------------------------------------------------
 # On Visual Studio 8 MS deprecated C. This removes all 1.276E1265 security
 # warnings
 IF(WIN32)
@@ -77,7 +76,7 @@ ENDIF(WIN32)
 # Install directories
 
 STRING(TOLOWER ${PROJECT_NAME} projectname)
-SET(subdir "${projectname}-${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}")
+SET(OPENJPEG_INSTALL_SUBDIR "${projectname}-${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}")
 
 IF(NOT OPENJPEG_INSTALL_BIN_DIR)
   SET(OPENJPEG_INSTALL_BIN_DIR "bin")
@@ -87,8 +86,12 @@ IF(NOT OPENJPEG_INSTALL_LIB_DIR)
   SET(OPENJPEG_INSTALL_LIB_DIR "lib")
 ENDIF(NOT OPENJPEG_INSTALL_LIB_DIR)
 
+IF(NOT OPENJPEG_INSTALL_SHARE_DIR)
+  SET(OPENJPEG_INSTALL_SHARE_DIR "share")
+ENDIF(NOT OPENJPEG_INSTALL_SHARE_DIR)
+
 IF(NOT OPENJPEG_INSTALL_DATA_DIR)
-  SET(OPENJPEG_INSTALL_DATA_DIR "share/${subdir}")
+  SET(OPENJPEG_INSTALL_DATA_DIR "${OPENJPEG_INSTALL_SHARE_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
 ENDIF(NOT OPENJPEG_INSTALL_DATA_DIR)
 
 IF(NOT OPENJPEG_INSTALL_INCLUDE_DIR)
@@ -100,128 +103,147 @@ IF(NOT OPENJPEG_INSTALL_MAN_DIR)
 ENDIF(NOT OPENJPEG_INSTALL_MAN_DIR)
 
 IF(NOT OPENJPEG_INSTALL_DOC_DIR)
-  SET(OPENJPEG_INSTALL_DOC_DIR "share/doc/${subdir}")
+  SET(OPENJPEG_INSTALL_DOC_DIR "share/doc/${OPENJPEG_INSTALL_SUBDIR}")
 ENDIF(NOT OPENJPEG_INSTALL_DOC_DIR)
 
 IF(NOT OPENJPEG_INSTALL_PACKAGE_DIR)
-  SET(OPENJPEG_INSTALL_PACKAGE_DIR ${OPENJPEG_INSTALL_LIB_DIR}/${subdir}
-    CACHE INTERNAL "")
+  SET(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_SHARE_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
 ENDIF(NOT OPENJPEG_INSTALL_PACKAGE_DIR)
 
 #-----------------------------------------------------------------------------
-# Test for some required system information.
-INCLUDE (${CMAKE_ROOT}/Modules/CMakeBackwardCompatibilityC.cmake)
-
-#-----------------------------------------------------------------------------
-# Test for getopt being available in this system
-INCLUDE (${PROJECT_SOURCE_DIR}/CMake/CheckHaveGetopt.cmake )
+# Big endian test:
+INCLUDE (${CMAKE_ROOT}/Modules/TestBigEndian.cmake)
+TEST_BIG_ENDIAN(OPJ_BIG_ENDIAN)
 
 #-----------------------------------------------------------------------------
 # Setup file for setting custom ctest vars
 CONFIGURE_FILE(
-  ${CMAKE_CURRENT_SOURCE_DIR}/CMake/CTestCustom.cmake.in
-  ${CMAKE_CURRENT_BINARY_DIR}/CTestCustom.cmake
+  ${CMAKE_SOURCE_DIR}/CMake/CTestCustom.cmake.in
+  ${CMAKE_BINARY_DIR}/CTestCustom.cmake
   @ONLY
   )
 
 #-----------------------------------------------------------------------------
 # 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.")
 SET (LIBRARY_OUTPUT_PATH ${OPENJPEG_BINARY_DIR}/bin CACHE PATH "Single output directory for building all libraries.")
 MARK_AS_ADVANCED(LIBRARY_OUTPUT_PATH EXECUTABLE_OUTPUT_PATH)
 
-
+#-----------------------------------------------------------------------------
 # configure name mangling to allow multiple libraries to coexist
 # peacefully
 IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/openjpeg_mangle.h.in)
 SET(MANGLE_PREFIX ${OPENJPEG_LIBRARY_NAME})
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/openjpeg_mangle.h.in
                ${CMAKE_CURRENT_BINARY_DIR}/openjpeg_mangle.h
-               @ONLY IMMEDIATE)
+               @ONLY)
 ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/openjpeg_mangle.h.in)
 
 #-----------------------------------------------------------------------------
-# Translate CMake configuration options into #defines that can be queried from
-# the code.
-#CONFIGURE_FILE(
-#   ${PROJECT_SOURCE_DIR}/opj_configh.cmake.in
-#   ${PROJECT_BINARY_DIR}/opj_config.h)
+# pkgconfig support
+IF(UNIX)
+  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libopenjpeg1.pc.cmake
+    ${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg1.pc @ONLY)
+  INSTALL( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg1.pc DESTINATION
+    ${OPENJPEG_INSTALL_SHARE_DIR}/pkgconfig )
+  INSTALL( CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink
+  \"libopenjpeg1.pc\"
+  \"\$ENV{DESTDIR}${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig/libopenjpeg.pc\")")
+ENDIF(UNIX)
 
 #-----------------------------------------------------------------------------
-# Always build the library
-INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
-SUBDIRS(
-  libopenjpeg
-  mj2
-  )
+# Compiler specific flags:
+IF(CMAKE_COMPILER_IS_GNUCC)
+  # For all builds, make sure openjpeg is std99 compliant:
+  # SET(CMAKE_C_FLAGS "-Wall -std=c99 ${CMAKE_C_FLAGS}") # FIXME: this setting prevented us from setting a coverage build.
+  # Do not use ffast-math for all build, it would produce incorrect results, only set for release:
+  SET(CMAKE_C_FLAGS_RELEASE "-ffast-math ${CMAKE_C_FLAGS_RELEASE}")
+ENDIF(CMAKE_COMPILER_IS_GNUCC)
+
+#-----------------------------------------------------------------------------
+# opj_config.h generation (1/2)
+INCLUDE (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)
+CHECK_INCLUDE_FILE("strings.h"      HAVE_STRINGS_H)
+CHECK_INCLUDE_FILE("inttypes.h"     HAVE_INTTYPES_H)
+CHECK_INCLUDE_FILE("memory.h"       HAVE_MEMORY_H)
+CHECK_INCLUDE_FILE("stdint.h"       HAVE_STDINT_H)
+CHECK_INCLUDE_FILE("stdlib.h"       HAVE_STDLIB_H)
+CHECK_INCLUDE_FILE("string.h"       HAVE_STRING_H)
+CHECK_INCLUDE_FILE("sys/stat.h"     HAVE_SYS_STAT_H)
+CHECK_INCLUDE_FILE("sys/types.h"    HAVE_SYS_TYPES_H)
+CHECK_INCLUDE_FILE("unistd.h"       HAVE_UNISTD_H)
 
-IF(NOT UNIX)
-SUBDIRS(
-  indexer_JPIP
-  )
-ENDIF(NOT UNIX)
 
 #-----------------------------------------------------------------------------
-# Build example codec ?
-OPTION(BUILD_EXAMPLES "Build the Examples (codec...)." ON)
-IF(BUILD_EXAMPLES)
-  SUBDIRS(codec)
-ENDIF(BUILD_EXAMPLES)
+# Build Library
+INCLUDE_DIRECTORIES(BEFORE ${OPENJPEG_BINARY_DIR})
+ADD_SUBDIRECTORY(libopenjpeg)
 
 #-----------------------------------------------------------------------------
-# Build JPWL binaries ?
-OPTION(BUILD_JPWL "Build the JPWL binaries" OFF)
-IF(BUILD_JPWL)
-  SUBDIRS(jpwl)
-ENDIF(BUILD_JPWL)
+# Build Applications
+OPTION(BUILD_CODEC "Build the CODEC executables" ON)
+OPTION(BUILD_MJ2 "Build the MJ2 executables." OFF)
+OPTION(BUILD_JPWL "Build the JPWL library and executables" OFF)
+OPTION(BUILD_JPIP "Build the JPIP library and executables." OFF)
+IF(BUILD_JPIP)
+  OPTION(BUILD_JPIP_SERVER "Build the JPIP server." OFF)
+ENDIF(BUILD_JPIP)
+OPTION(BUILD_VIEWER "Build the OPJViewer executable (C++)" OFF)
+OPTION(BUILD_JAVA "Build the openjpeg jar (Java)" OFF)
+MARK_AS_ADVANCED(BUILD_VIEWER)
+MARK_AS_ADVANCED(BUILD_JAVA)
+
+IF(BUILD_CODEC OR BUILD_MJ2)
+  # OFF: It will only build 3rd party libs if they are not found on the system
+  # ON: 3rd party libs will ALWAYS be build, and used
+  OPTION(BUILD_THIRDPARTY "Build the thirdparty executables if it is needed" OFF)
+  ADD_SUBDIRECTORY(thirdparty)
+  ADD_SUBDIRECTORY(applications)
+ENDIF (BUILD_CODEC OR BUILD_MJ2)
 
 #-----------------------------------------------------------------------------
-# Build JP3D binaries ?
-OPTION(BUILD_JP3D "Build the JP3D binaries" OFF)
-IF(BUILD_JP3D)
-  SUBDIRS(jp3d)
-ENDIF(BUILD_JP3D)
+# opj_config.h generation (2/2)
+CONFIGURE_FILE("${OPENJPEG_SOURCE_DIR}/opj_config.h.cmake.in"
+ "${OPENJPEG_BINARY_DIR}/opj_config.h"
+ @ONLY
+ )
 
 #-----------------------------------------------------------------------------
-# Build documentation ?
-OPTION(BUILD_DOCUMENTATION "Build the doxygen documentation" OFF)
-IF(BUILD_DOCUMENTATION)
-  SUBDIRS(doc)
-ENDIF(BUILD_DOCUMENTATION)
+# Build DOCUMENTATION (not in ALL target and only if Doxygen is found)
+OPTION(BUILD_DOC "Build the HTML documentation (with doxygen if available)." OFF)
+IF(BUILD_DOC)
+    ADD_SUBDIRECTORY(doc)
+ENDIF(BUILD_DOC)
 
 #-----------------------------------------------------------------------------
-# For openjpeg team if they ever want CDash+CMake
+# Buld Testing
 OPTION(BUILD_TESTING "Build the tests." OFF)
 IF(BUILD_TESTING)
-  ENABLE_TESTING()
-  INCLUDE(CTest)
+  IF(BUILD_CODEC)
+    ENABLE_TESTING()
+    INCLUDE(CTest)
+  
+    # Search openjpeg data needed for the tests
+    # They could be found via svn on the OpenJPEG google code project
+    # svn checkout http://openjpeg.googlecode.com/svn/data (about 70 Mo) 
+    FIND_PATH(OPJ_DATA_ROOT README-OPJ-Data
+      PATHS
+      $ENV{OPJ_DATA_ROOT}
+      ${CMAKE_SOURCE_DIR}/../data
+      )
+
+    # Add repository where to find tests
+    ADD_SUBDIRECTORY(tests)
+    
+  ELSE(BUILD_CODEC)
+    message(FATAL_ERROR "You need build codec to run the tests")
+  ENDIF(BUILD_CODEC)
 ENDIF(BUILD_TESTING)
 
-# Adding test with dataset from:
-# http://www.crc.ricoh.com/~gormish/jpeg2000conformance/
-# -> wget http://www.crc.ricoh.com/~gormish/jpeg2000conformance/j2kp4files_v1_5.zip
-# http://www.jpeg.org/jpeg2000guide/testimages/testimages.html
 #-----------------------------------------------------------------------------
-# Adding JPEG2000_CONFORMANCE_DATA_ROOT
-FIND_PATH(JPEG2000_CONFORMANCE_DATA_ROOT testimages.html
-  ${OPENJPEG_SOURCE_DIR}/../jpeg2000testimages
-  $ENV{JPEG2000_CONFORMANCE_DATA_ROOT}
-)
-
-#-----------------------------------------------------------------------------
-# Compiler specific flags:
-IF(CMAKE_COMPILER_IS_GNUCC)
-  # For all builds, make sure openjpeg is std99 compliant:
-  # SET(CMAKE_C_FLAGS "-Wall -std=c99 ${CMAKE_C_FLAGS}") # FIXME: this setting prevented us from setting a coverage build.
-  # Do not use ffast-math for all build, it would produce incorrect results, only set for release:
-  SET(CMAKE_C_FLAGS_RELEASE "-ffast-math ${CMAKE_C_FLAGS_RELEASE}")
-ENDIF(CMAKE_COMPILER_IS_GNUCC)
-
 # install all targets referenced as OPENJPEGTargets
-install(EXPORT OpenJPEGTargets DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR})
+INSTALL(EXPORT OpenJPEGTargets DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR})
 CONFIGURE_FILE( ${OPENJPEG_SOURCE_DIR}/CMake/OpenJPEGConfig.cmake.in
   ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake
   @ONLY
@@ -229,102 +251,12 @@ CONFIGURE_FILE( ${OPENJPEG_SOURCE_DIR}/CMake/OpenJPEGConfig.cmake.in
 INSTALL( FILES ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake
   DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR}
 )
-#
-SET(CMAKE_PREFIX_PATH /usr /usr/local /opt /opt/local)
-#
-FIND_FILE(HAVE_STRINGS_H strings.h)
-FIND_FILE(HAVE_INTTYPES_H inttypes.h)
-FIND_FILE(HAVE_MEMORY_H memory.h)
-FIND_FILE(HAVE_STDLIB_H stdlib.h)
-FIND_FILE(HAVE_STRING_H string.h)
-FIND_FILE(HAVE_SYS_STAT_H sys/stat.h)
-FIND_FILE(HAVE_SYS_TYPES_H sys/types.h)
-FIND_FILE(HAVE_UNISTD_H unistd.h)
-#
-# Does the system have png library installed ?
-# FIND_PACKAGE not used because not robust enough
-#
-FIND_PATH(PNG_INCLUDE_DIR png.h PATHS /usr/include /usr/include/libpng14 /usr/include/libpng12 /usr/include/libpng /usr/local/include /usr/local/include/libpng14 /usr/local/include/libpng12 /usr/local/include/libpng /opt/include /opt/include/libpng14 /opt/include/libpng12 /opt/include/libpng /opt/local/include /opt/local/include/libpng14 /opt/local/include/libpng12 /opt/local/include/libpng)
-#
-IF(PNG_INCLUDE_DIR STREQUAL "PNG_INCLUDE_DIR-NOTFOUND")
-  SET(HAVE_PNG_H 0)
-ELSE()
-  SET(HAVE_PNG_H 1)
-ENDIF()
-FIND_LIBRARY(PNG_LIBRARIES NAMES png14 png12 png )
-IF(PNG_LIBRARIES STREQUAL "PNG_LIBRARIES-NOTFOUND")
-  SET(HAVE_LIBPNG 0)
-ELSE()
-  SET(HAVE_LIBPNG 1)
-ENDIF()
-IF(HAVE_LIBPNG AND HAVE_PNG_H)
-  SET(PNG_FOUND 1)
-ELSE()
-  SET(PNG_FOUND 0)
-ENDIF()
-#
-# Does the system have tiff library installed ?
-# FIND_PACKAGE not used because not robust enough
-#
-FIND_PATH(TIFF_INCLUDE_DIR tiff.h)
-IF(TIFF_INCLUDE_DIR STREQUAL "TIFF_INCLUDE_DIR-NOTFOUND")
-  SET(HAVE_TIFF_H 0)
-ELSE()
-  SET(HAVE_TIFF_H 1)
-ENDIF()
-FIND_LIBRARY(TIFF_LIBRARIES tiff)
-IF(TIFF_LIBRARIES STREQUAL "TIFF_LIBRARIES-NOTFOUND")
-  SET(HAVE_LIBTIFF 0)
-ELSE()
-  SET(HAVE_LIBTIFF 1)
-ENDIF()
-IF(HAVE_LIBTIFF AND HAVE_TIFF_H)
-  SET(TIFF_FOUND 1)
-ELSE()
-  SET(TIFF_FOUND 0)
-ENDIF()
-#
-# Does the system have lcms library installed ?
-#
-SET(LCMS_LIB "")
-FIND_FILE(LCMS2_HEADER_FOUND lcms2.h)
-#
-IF(LCMS2_HEADER_FOUND STREQUAL "LCMS2_HEADER_FOUND-NOTFOUND")
- SET(LCMS2_HEADER_FOUND "")
-ENDIF()
-IF(LCMS2_HEADER_FOUND)
- FIND_PATH(LCMS_INCLUDE_DIR  lcms2.h)
- FIND_LIBRARY(HAVE_LIBLCMS2 lcms2)
- IF(HAVE_LIBLCMS2 STREQUAL "HAVE_LIBLCMS2-NOTFOUND")
-  SET(HAVE_LIBLCMS2 "")
- ENDIF()
- IF(HAVE_LIBLCMS2)
-  SET(LCMS_LIB "${HAVE_LIBLCMS2}")
-  SET(HAVE_LCMS2_LIB 1)
-  SET(HAVE_LCMS2_H 1)
- ENDIF()
-ENDIF()
-IF(NOT LCMS2_HEADER_FOUND)
- FIND_FILE(LCMS1_HEADER_FOUND lcms.h)
- IF(LCMS1_HEADER_FOUND STREQUAL "LCMS1_HEADER_FOUND-NOTFOUND")
-  SET(LCMS1_HEADER_FOUND "")
- ENDIF()
- IF(LCMS1_HEADER_FOUND)
-  FIND_PATH(LCMS_INCLUDE_DIR  lcms.h)
-  FIND_LIBRARY(HAVE_LIBLCMS1 lcms)
-  IF(HAVE_LIBLCMS1 STREQUAL "HAVE_LIBLCMS1-NOTFOUND")
-   SET(HAVE_LIBLCMS1 "")
-  ENDIF()
-  IF(HAVE_LIBLCMS1)
-   SET(LCMS_LIB "${HAVE_LIBLCMS1}")
-   SET(HAVE_LCMS1_LIB 1)
-   SET(HAVE_LCMS1_H 1)
-  ENDIF()
- ENDIF()
-ENDIF()
-#
-# generate opj_config.h
-CONFIGURE_FILE("${OPENJPEG_SOURCE_DIR}/opj_configh.cmake.in"
-  "${OPENJPEG_BINARY_DIR}/opj_config.h" 
-)
 
+#-----------------------------------------------------------------------------
+# install CHANGES and LICENSE
+INSTALL(
+  FILES       CHANGES 
+              LICENSE
+  DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
+
+INCLUDE (CMake/OpenJPEGCPack.cmake)