walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Import change from trunk to be able to generate dists.

This commit is contained in:
Mathieu Malaterre 2011-12-16 11:00:30 +00:00
parent 4bcd3a1e42
commit fba8f701c4
3 changed files with 73 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
CMake/OpenJPEGCPack.cmake Normal file
View File

@ -0,0 +1,23 @@
# package bundler
if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
if(EXISTS "${CMAKE_ROOT}/Modules/InstallRequiredSystemLibraries.cmake")
set(CMAKE_INSTALL_MFC_LIBRARIES 0)
set(CMAKE_INSTALL_DEBUG_LIBRARIES 0)
include(${CMAKE_ROOT}/Modules/InstallRequiredSystemLibraries.cmake)
endif(EXISTS "${CMAKE_ROOT}/Modules/InstallRequiredSystemLibraries.cmake")
set(OPJ_PACKAGE_DESCRIPTION_SUMMARY "OpenJPEG - OpenJPEG a JPEG 2000 implementation.")
set(OPJ_PACKAGE_CONTACT "openjpeg users <openjpeg@googlegroups.com>")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY ${OPJ_PACKAGE_DESCRIPTION_SUMMARY})
set(CPACK_PACKAGE_VENDOR "OpenJPEG")
set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
set(CPACK_PACKAGE_VERSION_MAJOR "${OPENJPEG_VERSION_MAJOR}")
set(CPACK_PACKAGE_VERSION_MINOR "${OPENJPEG_VERSION_MINOR}")
set(CPACK_PACKAGE_VERSION_PATCH "${OPENJPEG_VERSION_BUILD}")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "OpenJPEG ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}")
set(CPACK_SOURCE_PACKAGE_FILE_NAME "openjpeg-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
include(CPack)
endiF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")

68
CMakeLists.txt
View File

@ -28,7 +28,7 @@ INCLUDE_REGULAR_EXPRESSION("^.*$")
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# OPENJPEG version number, useful for packaging and doxygen doc: # OPENJPEG version number, useful for packaging and doxygen doc:
SET(OPENJPEG_VERSION_MAJOR 1) SET(OPENJPEG_VERSION_MAJOR 1)
SET(OPENJPEG_VERSION_MINOR 4) SET(OPENJPEG_VERSION_MINOR 5)
SET(OPENJPEG_VERSION_BUILD 0) SET(OPENJPEG_VERSION_BUILD 0)
SET(OPENJPEG_VERSION SET(OPENJPEG_VERSION
"${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}") "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}")
@ -39,12 +39,13 @@ SET(OPENJPEG_LIBRARY_PROPERTIES
SOVERSION "${OPENJPEG_VERSION_MAJOR}" SOVERSION "${OPENJPEG_VERSION_MAJOR}"
) )
# --------------------------------------------------------------------------
# Path to additional CMake modules # Path to additional CMake modules
SET(CMAKE_MODULE_PATH SET(CMAKE_MODULE_PATH
${CMAKE_SOURCE_DIR}/CMake ${CMAKE_SOURCE_DIR}/CMake
${CMAKE_MODULE_PATH}) ${CMAKE_MODULE_PATH})
# --------------------------------------------------------------------------
# On Visual Studio 8 MS deprecated C. This removes all 1.276E1265 security # On Visual Studio 8 MS deprecated C. This removes all 1.276E1265 security
# warnings # warnings
IF(WIN32) IF(WIN32)
@ -110,6 +111,10 @@ ENDIF(NOT OPENJPEG_INSTALL_PACKAGE_DIR)
# Test for some required system information. # Test for some required system information.
INCLUDE (${CMAKE_ROOT}/Modules/CMakeBackwardCompatibilityC.cmake) INCLUDE (${CMAKE_ROOT}/Modules/CMakeBackwardCompatibilityC.cmake)
# Big endian test:
INCLUDE (${CMAKE_ROOT}/Modules/TestBigEndian.cmake)
TEST_BIG_ENDIAN(OPJ_BIG_ENDIAN)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Setup file for setting custom ctest vars # Setup file for setting custom ctest vars
CONFIGURE_FILE( CONFIGURE_FILE(
@ -132,7 +137,7 @@ IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/openjpeg_mangle.h.in)
SET(MANGLE_PREFIX ${OPENJPEG_LIBRARY_NAME}) SET(MANGLE_PREFIX ${OPENJPEG_LIBRARY_NAME})
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/openjpeg_mangle.h.in CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/openjpeg_mangle.h.in
${CMAKE_CURRENT_BINARY_DIR}/openjpeg_mangle.h ${CMAKE_CURRENT_BINARY_DIR}/openjpeg_mangle.h
@ONLY IMMEDIATE) @ONLY)
ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/openjpeg_mangle.h.in) ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/openjpeg_mangle.h.in)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
@ -153,51 +158,16 @@ ENDIF(CMAKE_COMPILER_IS_GNUCC)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# opj_config.h generation (1/2) # opj_config.h generation (1/2)
FIND_FILE(HAVE_STRINGS_H_FOUND strings.h) CHECK_INCLUDE_FILE("strings.h" HAVE_STRINGS_H)
IF(NOT HAVE_STRINGS_H_FOUND STREQUAL "HAVE_STRINGS_H_FOUND-NOTFOUND") CHECK_INCLUDE_FILE("inttypes.h" HAVE_INTTYPES_H)
FIND_FILE(HAVE_STRINGS_H strings.h) CHECK_INCLUDE_FILE("memory.h" HAVE_MEMORY_H)
SET(HAS_STRINGS_H 1) CHECK_INCLUDE_FILE("stdint.h" HAVE_STDINT_H)
ENDIF() CHECK_INCLUDE_FILE("stdlib.h" HAVE_STDLIB_H)
FIND_FILE(HAVE_INTTYPES_H_FOUND inttypes.h) CHECK_INCLUDE_FILE("string.h" HAVE_STRING_H)
IF(NOT HAVE_INTTYPES_H_FOUND STREQUAL "HAVE_INTTYPES_H_FOUND-NOTFOUND") CHECK_INCLUDE_FILE("sys/stat.h" HAVE_SYS_STAT_H)
FIND_FILE(HAVE_INTTYPES_H inttypes.h) CHECK_INCLUDE_FILE("sys/types.h" HAVE_SYS_TYPES_H)
SET(HAS_INTTYPES_H 1) CHECK_INCLUDE_FILE("unistd.h" HAVE_UNISTD_H)
ENDIF()
FIND_FILE(HAVE_MEMORY_H_FOUND memory.h)
IF(NOT HAVE_MEMORY_H_FOUND STREQUAL "HAVE_MEMORY_H_FOUND-NOTFOUND")
FIND_FILE(HAVE_MEMORY_H memory.h)
SET(HAS_MEMORY_H 1)
ENDIF()
FIND_FILE(HAVE_STDINT_H_FOUND stdint.h)
IF(NOT HAVE_STDINT_H_FOUND STREQUAL "HAVE_STDINT_H_FOUND-NOTFOUND")
FIND_FILE(HAVE_STDINT_H stdint.h)
SET(HAS_STDINT_H 1)
ENDIF()
FIND_FILE(HAVE_STDLIB_H_FOUND stdlib.h)
IF(NOT HAVE_STDLIB_H_FOUND STREQUAL "HAVE_STDLIB_H_FOUND-NOTFOUND")
FIND_FILE(HAVE_STDLIB_H stdlib.h)
SET(HAS_STDLIB_H 1)
ENDIF()
FIND_FILE(HAVE_STRING_H_FOUND string.h)
IF(NOT HAVE_STRING_H_FOUND STREQUAL "HAVE_STRING_H_FOUND-NOTFOUND")
FIND_FILE(HAVE_STRING_H string.h)
SET(HAS_STRING_H 1)
ENDIF()
FIND_FILE(HAVE_SYS_STAT_H_FOUND sys/stat.h)
IF(NOT HAVE_SYS_STAT_H_FOUND STREQUAL "HAVE_SYS_STAT_H_FOUND-NOTFOUND")
FIND_FILE(HAVE_SYS_STAT_H sys/stat.h)
SET(HAS_SYS_STAT_H 1)
ENDIF()
FIND_FILE(HAVE_SYS_TYPES_H_FOUND sys/types.h)
IF(NOT HAVE_SYS_TYPES_H_FOUND STREQUAL "HAVE_SYS_TYPES_H_FOUND-NOTFOUND")
FIND_FILE(HAVE_SYS_TYPES_H sys/types.h)
SET(HAS_SYS_TYPES_H 1)
ENDIF()
FIND_FILE(HAVE_UNISTD_H_FOUND unistd.h)
IF(NOT HAVE_UNISTD_H_FOUND STREQUAL "HAVE_UNISTD_H_FOUND-NOTFOUND")
FIND_FILE(HAVE_UNISTD_H unistd.h)
SET(HAS_UNISTD_H 1)
ENDIF()
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Build Library # Build Library
@ -287,3 +257,5 @@ INSTALL(
FILES CHANGES FILES CHANGES
LICENSE LICENSE
DESTINATION ${OPENJPEG_INSTALL_DOC_DIR}) DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
INCLUDE (CMake/OpenJPEGCPack.cmake)

47
opj_config.h.cmake.in
View File

@ -1,22 +1,35 @@
/* create config.h for CMake */ /* create config.h for CMake */
#define PACKAGE_VERSION "@PACKAGE_VERSION@" #define PACKAGE_VERSION "@PACKAGE_VERSION@"
#cmakedefine HAVE_INTTYPES_H @HAS_INTTYPES_H@ #cmakedefine HAVE_INTTYPES_H
#cmakedefine HAVE_MEMORY_H @HAS_MEMORY_H@ #cmakedefine HAVE_MEMORY_H
#cmakedefine HAVE_STDINT_H @HAS_STDINT_H@ #cmakedefine HAVE_STDINT_H
#cmakedefine HAVE_STDLIB_H @HAS_STDLIB_H@ #cmakedefine HAVE_STDLIB_H
#cmakedefine HAVE_STRINGS_H @HAS_STRINGS_H@ #cmakedefine HAVE_STRINGS_H
#cmakedefine HAVE_STRING_H @HAS_STRING_H@ #cmakedefine HAVE_STRING_H
#cmakedefine HAVE_SYS_STAT_H @HAS_SYS_STAT_H@ #cmakedefine HAVE_SYS_STAT_H
#cmakedefine HAVE_SYS_TYPES_H @HAS_SYS_TYPES_H@ #cmakedefine HAVE_SYS_TYPES_H
#cmakedefine HAVE_UNISTD_H @HAS_UNISTD_H@ #cmakedefine HAVE_UNISTD_H
#cmakedefine HAVE_LIBPNG @HAVE_LIBPNG@ #cmakedefine HAVE_LIBPNG
#cmakedefine HAVE_PNG_H @HAVE_PNG_H@ #cmakedefine HAVE_PNG_H
#cmakedefine HAVE_LIBTIFF @HAVE_LIBTIFF@ #cmakedefine HAVE_LIBTIFF
#cmakedefine HAVE_TIFF_H @HAVE_TIFF_H@ #cmakedefine HAVE_TIFF_H
#cmakedefine HAVE_LIBLCMS1 @HAVE_LIBLCMS1@ #cmakedefine HAVE_LIBLCMS1
#cmakedefine HAVE_LIBLCMS2 @HAVE_LIBLCMS2@ #cmakedefine HAVE_LIBLCMS2
#cmakedefine HAVE_LCMS1_H @HAVE_LCMS1_H@ #cmakedefine HAVE_LCMS1_H
#cmakedefine HAVE_LCMS2_H @HAVE_LCMS2_H@ #cmakedefine HAVE_LCMS2_H
/* Byte order. */
/* All compilers that support Mac OS X define either __BIG_ENDIAN__ or
__LITTLE_ENDIAN__ to match the endianness of the architecture being
compiled for. This is not necessarily the same as the architecture of the
machine doing the building. In order to support Universal Binaries on
Mac OS X, we prefer those defines to decide the endianness.
On other platforms we use the result of the TRY_RUN. */
#if !defined(__APPLE__)
#cmakedefine OPJ_BIG_ENDIAN
#elif defined(__BIG_ENDIAN__)
# define OPJ_BIG_ENDIAN
#endif