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

minor changes in cmake files (from winfried)

This commit is contained in:
Antonin Descampe 2010-11-17 10:26:05 +00:00
parent 8faf300b6e
commit 223a39b51e
6 changed files with 108 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -5,6 +5,9 @@ What's New for OpenJPEG
! : changed ! : changed
+ : added + : added
November 17, 2010
! [antonin] minor changes in cmake files (from winfried)
November 16, 2010 November 16, 2010
! [antonin] minor changes in cmake flags ! [antonin] minor changes in cmake flags

104
CMakeLists.txt
View File

@ -143,13 +143,6 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/openjpeg_mangle.h.in
@ONLY IMMEDIATE) @ONLY IMMEDIATE)
ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/openjpeg_mangle.h.in) 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)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Always build the library # Always build the library
INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
@ -164,7 +157,7 @@ ENDIF(BUILD_CODEC)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Build MJ2 binaries ? # Build MJ2 binaries ?
OPTION(BUILD_MJ2 "Build the MJ2 binaries." ON) OPTION(BUILD_MJ2 "Build the MJ2 binaries." OFF)
IF(BUILD_MJ2) IF(BUILD_MJ2)
SUBDIRS(mj2) SUBDIRS(mj2)
ENDIF(BUILD_MJ2) ENDIF(BUILD_MJ2)
@ -235,59 +228,87 @@ INSTALL( FILES ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake
DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR} DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR}
) )
# #
SET(CMAKE_PREFIX_PATH /usr /usr/local /opt /opt/local) IF(UNIX OR CYGWIN)
SET(CMAKE_INCLUDE_PATH /usr/include /usr/local/include /opt/include
/opt/local/include /usr/include/libpng /usr/include/libpng14
/usr/include/libpng12 /usr/local/include/libpng
/usr/local/include/libpng14 /usr/local/include/libpng12
/opt/include/libpng /opt/include/libpng14 /opt/include/libpng12
/opt/local/include/libpng /opt/local/include/libpng14
/opt/local/include/libpng12 )
SET(CMAKE_LIBRARY_PATH /usr/lib /usr/local/lib /opt/lib /opt/local/lib)
ELSEIF(WIN32)
SET(CMAKE_INCLUDE_PATH ${OPENJPEG_SOURCE_DIR}/libs/libtiff
${OPENJPEG_SOURCE_DIR}/libs/png ${OPENJPEG_SOURCE_DIR}/libs/lcms2
C:/WINDOWS/system32/user )
SET(CMAKE_LIBRARY_PATH ${OPENJPEG_SOURCE_DIR}/libs/libtiff
C:/WINDOWS/system32/user )
ENDIF()
# #
FIND_FILE(HAVE_STRINGS_H_FOUND strings.h)
IF(NOT HAVE_STRINGS_H_FOUND STREQUAL "HAVE_STRINGS_H_FOUND-NOTFOUND")
FIND_FILE(HAVE_STRINGS_H strings.h) FIND_FILE(HAVE_STRINGS_H strings.h)
SET(HAS_STRINGS_H 1)
ENDIF()
FIND_FILE(HAVE_INTTYPES_H_FOUND inttypes.h)
IF(NOT HAVE_INTTYPES_H_FOUND STREQUAL "HAVE_INTTYPES_H_FOUND-NOTFOUND")
FIND_FILE(HAVE_INTTYPES_H inttypes.h) FIND_FILE(HAVE_INTTYPES_H inttypes.h)
SET(HAS_INTTYPES_H 1)
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) 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) 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) 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) 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) 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) FIND_FILE(HAVE_UNISTD_H unistd.h)
SET(HAS_UNISTD_H 1)
ENDIF()
# #
# Does the system have png library installed ? # 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) FIND_PACKAGE(PNG)
# #
IF(PNG_INCLUDE_DIR STREQUAL "PNG_INCLUDE_DIR-NOTFOUND") IF(PNG_FOUND)
SET(HAVE_PNG_H 0)
ELSE()
SET(HAVE_PNG_H 1) 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) SET(HAVE_LIBPNG 1)
ENDIF() 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 ? # Does the system have tiff library installed ?
# FIND_PACKAGE not used because not robust enough
# #
FIND_PATH(TIFF_INCLUDE_DIR tiff.h) FIND_PACKAGE(TIFF)
IF(TIFF_INCLUDE_DIR STREQUAL "TIFF_INCLUDE_DIR-NOTFOUND") #
SET(HAVE_TIFF_H 0) IF(TIFF_FOUND)
ELSE()
SET(HAVE_TIFF_H 1) 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) SET(HAVE_LIBTIFF 1)
ENDIF() 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 ? # Does the system have lcms library installed ?
# #
@ -299,7 +320,11 @@ IF(LCMS2_HEADER_FOUND STREQUAL "LCMS2_HEADER_FOUND-NOTFOUND")
ENDIF() ENDIF()
IF(LCMS2_HEADER_FOUND) IF(LCMS2_HEADER_FOUND)
FIND_PATH(LCMS_INCLUDE_DIR lcms2.h) FIND_PATH(LCMS_INCLUDE_DIR lcms2.h)
IF(UNIX OR CYGWIN)
FIND_LIBRARY(HAVE_LIBLCMS2 lcms2) FIND_LIBRARY(HAVE_LIBLCMS2 lcms2)
ELSE()
FIND_LIBRARY(HAVE_LIBLCMS2 lcms2_static.lib)
ENDIF()
IF(HAVE_LIBLCMS2 STREQUAL "HAVE_LIBLCMS2-NOTFOUND") IF(HAVE_LIBLCMS2 STREQUAL "HAVE_LIBLCMS2-NOTFOUND")
SET(HAVE_LIBLCMS2 "") SET(HAVE_LIBLCMS2 "")
ENDIF() ENDIF()
@ -331,5 +356,6 @@ ENDIF()
# generate opj_config.h # generate opj_config.h
CONFIGURE_FILE("${OPENJPEG_SOURCE_DIR}/opj_configh.cmake.in" CONFIGURE_FILE("${OPENJPEG_SOURCE_DIR}/opj_configh.cmake.in"
"${OPENJPEG_BINARY_DIR}/opj_config.h" "${OPENJPEG_BINARY_DIR}/opj_config.h"
@ONLY
) )

2
INSTALL
View File

@ -56,7 +56,7 @@ Main available cmake flags:
* To specify the install path: '-DCMAKE_INSTALL_PREFIX=/path' * To specify the install path: '-DCMAKE_INSTALL_PREFIX=/path'
* To build the shared libraries: '-DBUILD_SHARED_LIBS:bool=on' (default: '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 CODEC executables: '-DBUILD_CODEC:bool=on' (default: 'ON')
* To build the MJ2 executables: '-DBUILD_MJ2:bool=on' (default: 'ON') * 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') * 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') * 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') * [WIN32 ONLY] To build the INDEXER_JPIP executable: '-DBUILD_INDEXER_JPIP:bool=on' (default: 'OFF')

16
JavaOpenJPEG/CMakeLists.txt
View File

@ -1,15 +1,16 @@
# Build the demo app, small examples #JavaOpenJPEG/CMakeLists.txt
# First thing define the common source: # First thing define the common source:
SET(common_SRCS SET(common_SRCS
convert.c ../codec/convert.c
../codec/index.c
) )
# If not getopt was found then add it to the lib: # If not getopt was found then add it to the lib:
IF(DONT_HAVE_GETOPT) IF(DONT_HAVE_GETOPT)
SET(common_SRCS SET(common_SRCS
${common_SRCS} ${common_SRCS}
compat/getopt.c ../codec/compat/getopt.c
) )
ENDIF(DONT_HAVE_GETOPT) ENDIF(DONT_HAVE_GETOPT)
@ -17,14 +18,17 @@ ENDIF(DONT_HAVE_GETOPT)
# Headers file are located here: # Headers file are located here:
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${OPENJPEG_SOURCE_DIR}/libopenjpeg ${OPENJPEG_SOURCE_DIR}/libopenjpeg
${LCMS_INCLUDE_DIR}
${PNG_INCLUDE_DIR}
${ZLIB_INCLUDE_DIR}
${TIFF_INCLUDE_DIR}
) )
FIND_PACKAGE(TIFF REQUIRED)
# Loop over all executables: # Loop over all executables:
FOREACH(exe j2k_to_image image_to_j2k) FOREACH(exe j2k_to_image image_to_j2k)
ADD_EXECUTABLE(${exe} ${exe}.c ${common_SRCS}) ADD_EXECUTABLE(${exe} ${exe}.c ${common_SRCS})
TARGET_LINK_LIBRARIES(${exe} ${OPJ_PREFIX}openjpeg ${TIFF_LIBRARIES}) TARGET_LINK_LIBRARIES(${exe} ${OPJ_PREFIX}openjpeg ${TIFF_LIBRARIES}
${PNG_LIBRARIES} ${ZLIB_LIBRARY} ${LCMS_LIB})
# On unix you need to link to the math library: # On unix you need to link to the math library:
IF(UNIX) IF(UNIX)
TARGET_LINK_LIBRARIES(${exe} -lm) TARGET_LINK_LIBRARIES(${exe} -lm)

5
jp3d/libjp3dvm/CMakeLists.txt
View File

@ -1,4 +1,9 @@
IF(UNIX OR CYGWIN)
ADD_DEFINITIONS(-O3) ADD_DEFINITIONS(-O3)
ELSEIF(WIN32)
ADD_DEFINITIONS(/Os)
ENDIF(UNIX OR CYGWIN)
#
INCLUDE_REGULAR_EXPRESSION("^.*$") INCLUDE_REGULAR_EXPRESSION("^.*$")
# Defines the source code for the library # Defines the source code for the library
SET(JP3DVM_SRCS SET(JP3DVM_SRCS

26
opj_configh.cmake.in
View File

@ -1,19 +1,19 @@
/* create config.h for CMake */ /* create config.h for CMake */
#define PACKAGE_VERSION "@PACKAGE_VERSION@" #define PACKAGE_VERSION "@PACKAGE_VERSION@"
# #
#cmakedefine01 HAVE_INTTYPES_H #cmakedefine HAVE_INTTYPES_H @HAS_INTTYPES_H@
#cmakedefine01 HAVE_MEMORY_H #cmakedefine HAVE_MEMORY_H @HAS_MEMORY_H@
#cmakedefine01 HAVE_STDINT_H #cmakedefine HAVE_STDINT_H @HAS_STDINT_H@
#cmakedefine01 HAVE_STDLIB_H #cmakedefine HAVE_STDLIB_H @HAS_STDLIB_H@
#cmakedefine01 HAVE_STRINGS_H #cmakedefine HAVE_STRINGS_H @HAS_STRINGS_H@
#cmakedefine01 HAVE_STRING_H #cmakedefine HAVE_STRING_H @HAS_STRING_H@
#cmakedefine01 HAVE_SYS_STAT_H #cmakedefine HAVE_SYS_STAT_H @HAS_SYS_STAT_H@
#cmakedefine01 HAVE_SYS_TYPES_H #cmakedefine HAVE_SYS_TYPES_H @HAS_SYS_TYPES_H@
#cmakedefine01 HAVE_UNISTD_H #cmakedefine HAVE_UNISTD_H @HAS_UNISTD_H@
#cmakedefine01 HAVE_LIBPNG #cmakedefine HAVE_LIBPNG @HAVE_LIBPNG@
#cmakedefine01 HAVE_PNG_H #cmakedefine HAVE_PNG_H @HAVE_PNG_H@
#cmakedefine01 HAVE_LIBTIFF #cmakedefine HAVE_LIBTIFF @HAVE_LIBTIFF@
#cmakedefine01 HAVE_TIFF_H #cmakedefine HAVE_TIFF_H @HAVE_TIFF_H@
# #
#cmakedefine HAVE_LIBLCMS1 @HAVE_LCMS1_LIB@ #cmakedefine HAVE_LIBLCMS1 @HAVE_LCMS1_LIB@
#cmakedefine HAVE_LIBLCMS2 @HAVE_LCMS2_LIB@ #cmakedefine HAVE_LIBLCMS2 @HAVE_LCMS2_LIB@