renamed "openjpeg3d" in "openjp3d"
This commit is contained in:
Antonin Descampe
parent
dbbad6f1b0
commit
48fc70d4d1
3
CHANGES
3
CHANGES
|
|
@ -5,6 +5,9 @@ What's New for OpenJPEG
|
|||
! : changed
|
||||
+ : added
|
||||
|
||||
April 16, 2011
|
||||
! [antonin] renamed "openjpeg3d" in "openjp3d"
|
||||
|
||||
April 13, 2011
|
||||
! [antonin] moved "openjpeg3d" directory from the trunk to the branches directory.
|
||||
! [antonin] renamed and reorganized "jp3d" directory to "openjpeg3d". Is now a standalone directory, with independent cmake files. Done as it uses its own version of the openjpeg library and does not depend on the one currently developped. Will be removed from the trunk and stored in a branch.
|
||||
|
|
|
|||
|
|
@ -1,48 +1,48 @@
|
|||
#-----------------------------------------------------------------------------
|
||||
#
|
||||
# OPENJPEG3DConfig.cmake - CMake configuration file for external projects.
|
||||
# OPENJP3DConfig.cmake - CMake configuration file for external projects.
|
||||
#
|
||||
# This file is configured by OPENJPEG3D and used by the UseOPENJPEG3D.cmake
|
||||
# module to load OPENJPEG3D's settings for an external project.
|
||||
@OPENJPEG3D_CONFIG_INSTALL_ONLY@
|
||||
# The OPENJPEG3D version number.
|
||||
SET(OPENJPEG3D_MAJOR_VERSION "@OPENJPEG3D_VERSION_MAJOR@")
|
||||
SET(OPENJPEG3D_MINOR_VERSION "@OPENJPEG3D_VERSION_MINOR@")
|
||||
SET(OPENJPEG3D_BUILD_VERSION "@OPENJPEG3D_VERSION_BUILD@")
|
||||
# This file is configured by OPENJP3D and used by the UseOPENJP3D.cmake
|
||||
# module to load OPENJP3D's settings for an external project.
|
||||
@OPENJP3D_CONFIG_INSTALL_ONLY@
|
||||
# The OPENJP3D version number.
|
||||
SET(OPENJP3D_MAJOR_VERSION "@OPENJP3D_VERSION_MAJOR@")
|
||||
SET(OPENJP3D_MINOR_VERSION "@OPENJP3D_VERSION_MINOR@")
|
||||
SET(OPENJP3D_BUILD_VERSION "@OPENJP3D_VERSION_BUILD@")
|
||||
|
||||
# The libraries.
|
||||
SET(OPENJPEG3D_LIBRARIES "@OPENJPEG3D_LIBRARIES@")
|
||||
SET(OPENJP3D_LIBRARIES "@OPENJP3D_LIBRARIES@")
|
||||
|
||||
# The CMake macros dir.
|
||||
SET(OPENJPEG3D_CMAKE_DIR "@OPENJPEG3D_CMAKE_DIR_CONFIG@")
|
||||
SET(OPENJP3D_CMAKE_DIR "@OPENJP3D_CMAKE_DIR_CONFIG@")
|
||||
|
||||
# The configuration options.
|
||||
SET(OPENJPEG3D_BUILD_SHARED_LIBS "@OPENJPEG3D_BUILD_SHARED_LIBS@")
|
||||
SET(OPENJP3D_BUILD_SHARED_LIBS "@OPENJP3D_BUILD_SHARED_LIBS@")
|
||||
|
||||
# The "use" file.
|
||||
SET(OPENJPEG3D_USE_FILE "@OPENJPEG3D_USE_FILE_CONFIG@")
|
||||
SET(OPENJP3D_USE_FILE "@OPENJP3D_USE_FILE_CONFIG@")
|
||||
|
||||
get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
|
||||
if(EXISTS ${SELF_DIR}/OpenJPEG3DTargets.cmake)
|
||||
if(EXISTS ${SELF_DIR}/OpenJP3DTargets.cmake)
|
||||
# This is an install tree
|
||||
include(${SELF_DIR}/OpenJPEG3DTargets.cmake)
|
||||
get_filename_component(OPENJPEG3D_INCLUDE_ROOT "${SELF_DIR}/../../@OPENJPEG3D_INSTALL_INCLUDE_DIR@" ABSOLUTE)
|
||||
set(OPENJPEG3D_INCLUDE_DIRS ${OPENJPEG3D_INCLUDE_ROOT})
|
||||
include(${SELF_DIR}/OpenJP3DTargets.cmake)
|
||||
get_filename_component(OPENJP3D_INCLUDE_ROOT "${SELF_DIR}/../../@OPENJP3D_INSTALL_INCLUDE_DIR@" ABSOLUTE)
|
||||
set(OPENJP3D_INCLUDE_DIRS ${OPENJP3D_INCLUDE_ROOT})
|
||||
|
||||
else(EXISTS ${SELF_DIR}/OpenJPEG3DTargets.cmake)
|
||||
if(EXISTS ${SELF_DIR}/OpenJPEG3DExports.cmake)
|
||||
else(EXISTS ${SELF_DIR}/OpenJP3DTargets.cmake)
|
||||
if(EXISTS ${SELF_DIR}/OpenJP3DExports.cmake)
|
||||
# This is a build tree
|
||||
SET( OPENJPEG3D_INCLUDE_DIRS @OPENJPEG3D_INCLUDE_PATH@)
|
||||
SET( OPENJP3D_INCLUDE_DIRS @OPENJP3D_INCLUDE_PATH@)
|
||||
|
||||
include(${SELF_DIR}/OpenJPEG3DExports.cmake)
|
||||
include(${SELF_DIR}/OpenJP3DExports.cmake)
|
||||
|
||||
else(EXISTS ${SELF_DIR}/OpenJPEG3DExports.cmake)
|
||||
else(EXISTS ${SELF_DIR}/OpenJP3DExports.cmake)
|
||||
message(FATAL_ERROR "ooops")
|
||||
endif(EXISTS ${SELF_DIR}/OpenJPEG3DExports.cmake)
|
||||
endif(EXISTS ${SELF_DIR}/OpenJPEG3DTargets.cmake)
|
||||
endif(EXISTS ${SELF_DIR}/OpenJP3DExports.cmake)
|
||||
endif(EXISTS ${SELF_DIR}/OpenJP3DTargets.cmake)
|
||||
|
||||
set(OPENJPEG3D_USE_FILE ${SELF_DIR}/UseOPENJPEG3D.cmake)
|
||||
set(OPENJP3D_USE_FILE ${SELF_DIR}/UseOPENJP3D.cmake)
|
||||
|
||||
# Backward compatible part:
|
||||
SET(OPENJPEG3D_FOUND TRUE)
|
||||
SET(OPENJP3D_FOUND TRUE)
|
||||
|
||||
|
|
|
|||
134
CMakeLists.txt
134
CMakeLists.txt
|
|
@ -1,48 +1,48 @@
|
|||
# Main CMakeLists.txt to build the OpenJPEG3D 3D project using CMake (www.cmake.org)
|
||||
# Main CMakeLists.txt to build the OpenJP3D 3D project using CMake (www.cmake.org)
|
||||
# Written by Mathieu Malaterre
|
||||
|
||||
# This CMake project will by default create a library called openjpeg3d3d
|
||||
# This CMake project will by default create a library called openjp3d
|
||||
# But if you want to use this project within your own (CMake) project
|
||||
# you will eventually like to prefix the library to avoid linking confusion
|
||||
# For this purpose you can define a CMake var: OPENJPEG3D_NAMESPACE to whatever you like
|
||||
# For this purpose you can define a CMake var: OPENJP3D_NAMESPACE to whatever you like
|
||||
# e.g.:
|
||||
# SET(OPENJPEG3D_NAMESPACE "GDCMOPENJPEG3D")
|
||||
# SET(OPENJP3D_NAMESPACE "GDCMOPENJP3D")
|
||||
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
|
||||
|
||||
IF(COMMAND CMAKE_POLICY)
|
||||
CMAKE_POLICY(SET CMP0003 NEW)
|
||||
ENDIF(COMMAND CMAKE_POLICY)
|
||||
|
||||
IF(NOT OPENJPEG3D_NAMESPACE)
|
||||
SET(OPENJPEG3D_NAMESPACE "OPENJPEG3D")
|
||||
SET(OPENJPEG3D_STANDALONE 1)
|
||||
ENDIF(NOT OPENJPEG3D_NAMESPACE)
|
||||
IF(NOT OPENJP3D_NAMESPACE)
|
||||
SET(OPENJP3D_NAMESPACE "OPENJP3D")
|
||||
SET(OPENJP3D_STANDALONE 1)
|
||||
ENDIF(NOT OPENJP3D_NAMESPACE)
|
||||
# In all cases:
|
||||
STRING(TOLOWER ${OPENJPEG3D_NAMESPACE} OPENJPEG3D_LIBRARY_NAME)
|
||||
STRING(TOLOWER ${OPENJP3D_NAMESPACE} OPENJP3D_LIBRARY_NAME)
|
||||
|
||||
PROJECT(${OPENJPEG3D_NAMESPACE} C)
|
||||
PROJECT(${OPENJP3D_NAMESPACE} C)
|
||||
|
||||
# Do full dependency headers.
|
||||
INCLUDE_REGULAR_EXPRESSION("^.*$")
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
# OPENJPEG3D version number, useful for packaging and doxygen doc:
|
||||
SET(OPENJPEG3D_VERSION_MAJOR 1)
|
||||
SET(OPENJPEG3D_VERSION_MINOR 3)
|
||||
SET(OPENJPEG3D_VERSION_BUILD 0)
|
||||
SET(OPENJPEG3D_VERSION
|
||||
"${OPENJPEG3D_VERSION_MAJOR}.${OPENJPEG3D_VERSION_MINOR}.${OPENJPEG3D_VERSION_BUILD}")
|
||||
# OPENJP3D version number, useful for packaging and doxygen doc:
|
||||
SET(OPENJP3D_VERSION_MAJOR 1)
|
||||
SET(OPENJP3D_VERSION_MINOR 3)
|
||||
SET(OPENJP3D_VERSION_BUILD 0)
|
||||
SET(OPENJP3D_VERSION
|
||||
"${OPENJP3D_VERSION_MAJOR}.${OPENJP3D_VERSION_MINOR}.${OPENJP3D_VERSION_BUILD}")
|
||||
SET(PACKAGE_VERSION
|
||||
"${OPENJPEG3D_VERSION_MAJOR}.${OPENJPEG3D_VERSION_MINOR}.${OPENJPEG3D_VERSION_BUILD}")
|
||||
SET(OPENJPEG3D_LIBRARY_PROPERTIES
|
||||
VERSION "${OPENJPEG3D_VERSION_MAJOR}.${OPENJPEG3D_VERSION_MINOR}.${OPENJPEG3D_VERSION_BUILD}"
|
||||
SOVERSION "${OPENJPEG3D_VERSION_MAJOR}"
|
||||
"${OPENJP3D_VERSION_MAJOR}.${OPENJP3D_VERSION_MINOR}.${OPENJP3D_VERSION_BUILD}")
|
||||
SET(OPENJP3D_LIBRARY_PROPERTIES
|
||||
VERSION "${OPENJP3D_VERSION_MAJOR}.${OPENJP3D_VERSION_MINOR}.${OPENJP3D_VERSION_BUILD}"
|
||||
SOVERSION "${OPENJP3D_VERSION_MAJOR}"
|
||||
)
|
||||
# You will also need to define a value for the following variables:
|
||||
# OPENJPEG3D_INSTALL_BIN_DIR - binary dir (executables)
|
||||
# OPENJPEG3D_INSTALL_LIB_DIR - library dir (libs)
|
||||
# OPENJPEG3D_INSTALL_DATA_DIR - share dir (say, examples, data, etc)
|
||||
# OPENJPEG3D_INSTALL_INCLUDE_DIR - include dir (headers)
|
||||
# OPENJP3D_INSTALL_BIN_DIR - binary dir (executables)
|
||||
# OPENJP3D_INSTALL_LIB_DIR - library dir (libs)
|
||||
# OPENJP3D_INSTALL_DATA_DIR - share dir (say, examples, data, etc)
|
||||
# OPENJP3D_INSTALL_INCLUDE_DIR - include dir (headers)
|
||||
|
||||
|
||||
# On Visual Studio 8 MS deprecated C. This removes all 1.276E1265 security
|
||||
|
|
@ -75,36 +75,36 @@ ENDIF(WIN32)
|
|||
# Install directories
|
||||
|
||||
STRING(TOLOWER ${PROJECT_NAME} projectname)
|
||||
SET(subdir "${projectname}-${OPENJPEG3D_VERSION_MAJOR}.${OPENJPEG3D_VERSION_MINOR}")
|
||||
SET(subdir "${projectname}-${OPENJP3D_VERSION_MAJOR}.${OPENJP3D_VERSION_MINOR}")
|
||||
|
||||
IF(NOT OPENJPEG3D_INSTALL_BIN_DIR)
|
||||
SET(OPENJPEG3D_INSTALL_BIN_DIR "bin")
|
||||
ENDIF(NOT OPENJPEG3D_INSTALL_BIN_DIR)
|
||||
IF(NOT OPENJP3D_INSTALL_BIN_DIR)
|
||||
SET(OPENJP3D_INSTALL_BIN_DIR "bin")
|
||||
ENDIF(NOT OPENJP3D_INSTALL_BIN_DIR)
|
||||
|
||||
IF(NOT OPENJPEG3D_INSTALL_LIB_DIR)
|
||||
SET(OPENJPEG3D_INSTALL_LIB_DIR "lib")
|
||||
ENDIF(NOT OPENJPEG3D_INSTALL_LIB_DIR)
|
||||
IF(NOT OPENJP3D_INSTALL_LIB_DIR)
|
||||
SET(OPENJP3D_INSTALL_LIB_DIR "lib")
|
||||
ENDIF(NOT OPENJP3D_INSTALL_LIB_DIR)
|
||||
|
||||
IF(NOT OPENJPEG3D_INSTALL_DATA_DIR)
|
||||
SET(OPENJPEG3D_INSTALL_DATA_DIR "share/${subdir}")
|
||||
ENDIF(NOT OPENJPEG3D_INSTALL_DATA_DIR)
|
||||
IF(NOT OPENJP3D_INSTALL_DATA_DIR)
|
||||
SET(OPENJP3D_INSTALL_DATA_DIR "share/${subdir}")
|
||||
ENDIF(NOT OPENJP3D_INSTALL_DATA_DIR)
|
||||
|
||||
IF(NOT OPENJPEG3D_INSTALL_INCLUDE_DIR)
|
||||
SET(OPENJPEG3D_INSTALL_INCLUDE_DIR "include/")
|
||||
ENDIF(NOT OPENJPEG3D_INSTALL_INCLUDE_DIR)
|
||||
IF(NOT OPENJP3D_INSTALL_INCLUDE_DIR)
|
||||
SET(OPENJP3D_INSTALL_INCLUDE_DIR "include/")
|
||||
ENDIF(NOT OPENJP3D_INSTALL_INCLUDE_DIR)
|
||||
|
||||
IF(NOT OPENJPEG3D_INSTALL_MAN_DIR)
|
||||
SET(OPENJPEG3D_INSTALL_MAN_DIR "share/man/")
|
||||
ENDIF(NOT OPENJPEG3D_INSTALL_MAN_DIR)
|
||||
IF(NOT OPENJP3D_INSTALL_MAN_DIR)
|
||||
SET(OPENJP3D_INSTALL_MAN_DIR "share/man/")
|
||||
ENDIF(NOT OPENJP3D_INSTALL_MAN_DIR)
|
||||
|
||||
IF(NOT OPENJPEG3D_INSTALL_DOC_DIR)
|
||||
SET(OPENJPEG3D_INSTALL_DOC_DIR "share/doc/${subdir}")
|
||||
ENDIF(NOT OPENJPEG3D_INSTALL_DOC_DIR)
|
||||
IF(NOT OPENJP3D_INSTALL_DOC_DIR)
|
||||
SET(OPENJP3D_INSTALL_DOC_DIR "share/doc/${subdir}")
|
||||
ENDIF(NOT OPENJP3D_INSTALL_DOC_DIR)
|
||||
|
||||
IF(NOT OPENJPEG3D_INSTALL_PACKAGE_DIR)
|
||||
SET(OPENJPEG3D_INSTALL_PACKAGE_DIR ${OPENJPEG3D_INSTALL_LIB_DIR}/${subdir}
|
||||
IF(NOT OPENJP3D_INSTALL_PACKAGE_DIR)
|
||||
SET(OPENJP3D_INSTALL_PACKAGE_DIR ${OPENJP3D_INSTALL_LIB_DIR}/${subdir}
|
||||
CACHE INTERNAL "")
|
||||
ENDIF(NOT OPENJPEG3D_INSTALL_PACKAGE_DIR)
|
||||
ENDIF(NOT OPENJP3D_INSTALL_PACKAGE_DIR)
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
# Test for some required system information.
|
||||
|
|
@ -115,56 +115,56 @@ INCLUDE (${CMAKE_ROOT}/Modules/CMakeBackwardCompatibilityC.cmake)
|
|||
INCLUDE (${PROJECT_SOURCE_DIR}/CMake/CheckHaveGetopt.cmake )
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
# OpenJPEG3D build configuration options.
|
||||
OPTION(BUILD_SHARED_LIBS "Build OpenJPEG3D shared library and link executables against it." ON)
|
||||
# OpenJP3D build configuration options.
|
||||
OPTION(BUILD_SHARED_LIBS "Build OpenJP3D shared library and link executables against it." ON)
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
SET (EXECUTABLE_OUTPUT_PATH ${OPENJPEG3D_BINARY_DIR}/bin CACHE PATH "Single output directory for building all executables.")
|
||||
SET (LIBRARY_OUTPUT_PATH ${OPENJPEG3D_BINARY_DIR}/bin CACHE PATH "Single output directory for building all libraries.")
|
||||
SET (EXECUTABLE_OUTPUT_PATH ${OPENJP3D_BINARY_DIR}/bin CACHE PATH "Single output directory for building all executables.")
|
||||
SET (LIBRARY_OUTPUT_PATH ${OPENJP3D_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}/openjpeg3d_mangle.h.in)
|
||||
SET(MANGLE_PREFIX ${OPENJPEG3D_LIBRARY_NAME})
|
||||
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/openjpeg3d_mangle.h.in
|
||||
${CMAKE_CURRENT_BINARY_DIR}/openjpeg3d_mangle.h
|
||||
IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/openjp3d_mangle.h.in)
|
||||
SET(MANGLE_PREFIX ${OPENJP3D_LIBRARY_NAME})
|
||||
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/openjp3d_mangle.h.in
|
||||
${CMAKE_CURRENT_BINARY_DIR}/openjp3d_mangle.h
|
||||
@ONLY IMMEDIATE)
|
||||
ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/openjpeg3d_mangle.h.in)
|
||||
ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/openjp3d_mangle.h.in)
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
# pkgconfig support
|
||||
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libopenjpeg3d.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg3d.pc @ONLY)
|
||||
INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg3d.pc DESTINATION ${OPENJPEG3D_INSTALL_LIB_DIR}/pkgconfig )
|
||||
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libopenjp3d.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc @ONLY)
|
||||
INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc DESTINATION ${OPENJP3D_INSTALL_LIB_DIR}/pkgconfig )
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
# Always build the library
|
||||
INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
|
||||
SUBDIRS(libopenjpeg3d)
|
||||
SUBDIRS(libopenjp3d)
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
# Compiler specific flags:
|
||||
IF(CMAKE_COMPILER_IS_GNUCC)
|
||||
# For all builds, make sure openjpeg3d is std99 compliant:
|
||||
# For all builds, make sure openjp3d 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 OPENJPEG3DTargets
|
||||
install(EXPORT OpenJPEG3DTargets DESTINATION ${OPENJPEG3D_INSTALL_PACKAGE_DIR})
|
||||
CONFIGURE_FILE( ${OPENJPEG3D_SOURCE_DIR}/CMake/OpenJPEG3DConfig.cmake.in
|
||||
${OPENJPEG3D_BINARY_DIR}/OpenJPEG3DConfig.cmake
|
||||
# install all targets referenced as OPENJP3DTargets
|
||||
install(EXPORT OpenJP3DTargets DESTINATION ${OPENJP3D_INSTALL_PACKAGE_DIR})
|
||||
CONFIGURE_FILE( ${OPENJP3D_SOURCE_DIR}/CMake/OpenJP3DConfig.cmake.in
|
||||
${OPENJP3D_BINARY_DIR}/OpenJP3DConfig.cmake
|
||||
@ONLY
|
||||
)
|
||||
INSTALL( FILES ${OPENJPEG3D_BINARY_DIR}/OpenJPEG3DConfig.cmake
|
||||
DESTINATION ${OPENJPEG3D_INSTALL_PACKAGE_DIR}
|
||||
INSTALL( FILES ${OPENJP3D_BINARY_DIR}/OpenJP3DConfig.cmake
|
||||
DESTINATION ${OPENJP3D_INSTALL_PACKAGE_DIR}
|
||||
)
|
||||
# install CHANGES and LICENSE
|
||||
INSTALL(
|
||||
FILES LICENSE
|
||||
DESTINATION ${OPENJPEG3D_INSTALL_DOC_DIR})
|
||||
DESTINATION ${OPENJP3D_INSTALL_DOC_DIR})
|
||||
#
|
||||
FIND_FILE(HAVE_STRINGS_H_FOUND strings.h)
|
||||
IF(NOT HAVE_STRINGS_H_FOUND STREQUAL "HAVE_STRINGS_H_FOUND-NOTFOUND")
|
||||
|
|
@ -216,7 +216,7 @@ ENDIF()
|
|||
# Headers file are located here:
|
||||
INCLUDE_DIRECTORIES(
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/codec
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/libopenjpeg3d
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/libopenjp3d
|
||||
)
|
||||
|
||||
|
||||
|
|
|
|||
2
INSTALL
2
INSTALL
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
How to build and install openjpeg3d binaries
|
||||
How to build and install openjp3d binaries
|
||||
==========================================
|
||||
|
||||
REQUIREMENT : cmake (see www.cmake.org)
|
||||
|
|
|
|||
4
README
4
README
|
|
@ -19,9 +19,9 @@ If you find some bugs or if you have problems using the encoder/decoder, please
|
|||
======================================================
|
||||
|
||||
- After decompressing the zip file provided, you should find
|
||||
at least the following files in the created 'openjpeg3d' directory:
|
||||
at least the following files in the created 'openjp3d' directory:
|
||||
|
||||
* libopenjpeg3d - This directory contains all library related code
|
||||
* libopenjp3d - This directory contains all library related code
|
||||
* codec - This directory contains all codec related code
|
||||
* tcltk - This directory contains the API scripts
|
||||
* README - The file you are reading
|
||||
|
|
|
|||
|
|
@ -16,14 +16,14 @@ ENDIF(WIN32)
|
|||
# Loop over all executables:
|
||||
FOREACH(exe jp3d_to_volume volume_to_jp3d)
|
||||
ADD_EXECUTABLE(${exe} ${exe}.c ${common_SRCS})
|
||||
TARGET_LINK_LIBRARIES(${exe} ${OPENJPEG3D_LIBRARY_NAME})
|
||||
TARGET_LINK_LIBRARIES(${exe} ${OPENJP3D_LIBRARY_NAME})
|
||||
# On unix you need to link to the math library:
|
||||
IF(UNIX)
|
||||
TARGET_LINK_LIBRARIES(${exe} m)
|
||||
ENDIF(UNIX)
|
||||
# Install exe
|
||||
INSTALL(TARGETS ${exe}
|
||||
EXPORT OpenJPEG3DTargets
|
||||
DESTINATION ${OPENJPEG3D_INSTALL_BIN_DIR} COMPONENT Applications
|
||||
EXPORT OpenJP3DTargets
|
||||
DESTINATION ${OPENJP3D_INSTALL_BIN_DIR} COMPONENT Applications
|
||||
)
|
||||
ENDFOREACH(exe)
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include "openjpeg3d.h"
|
||||
#include "openjp3d.h"
|
||||
#ifdef _WIN32
|
||||
#include "windirent.h"
|
||||
#else
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
#include <stdlib.h>
|
||||
#include <math.h>
|
||||
|
||||
#include "openjpeg3d.h"
|
||||
#include "openjp3d.h"
|
||||
#include "getopt.h"
|
||||
#include "convert.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "openjpeg3d.h"
|
||||
#include "openjp3d.h"
|
||||
#include "getopt.h"
|
||||
#include "convert.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
prefix=@CMAKE_INSTALL_PREFIX@
|
||||
bindir=@OPENJPEG3D_INSTALL_BIN_DIR@
|
||||
datadir=@OPENJPEG3D_INSTALL_DATA_DIR@
|
||||
libdir=@OPENJPEG3D_INSTALL_LIB_DIR@
|
||||
includedir=@OPENJPEG3D_INSTALL_INCLUDE_DIR@
|
||||
bindir=@OPENJP3D_INSTALL_BIN_DIR@
|
||||
datadir=@OPENJP3D_INSTALL_DATA_DIR@
|
||||
libdir=@OPENJP3D_INSTALL_LIB_DIR@
|
||||
includedir=@OPENJP3D_INSTALL_INCLUDE_DIR@
|
||||
|
||||
Name: openjpeg3d
|
||||
Name: openjp3d
|
||||
Description: JPEG2000 files library
|
||||
URL: http://www.openjpeg.org/
|
||||
Version: @OPENJPEG3D_VERSION@
|
||||
Libs: -L${libdir} -lopenjpeg3d
|
||||
Version: @OPENJP3D_VERSION@
|
||||
Libs: -L${libdir} -lopenjp3d
|
||||
Cflags: -I${includedir}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
INCLUDE_REGULAR_EXPRESSION("^.*$")
|
||||
|
||||
# Defines the source code for the library
|
||||
SET(OPENJPEG3D_SRCS
|
||||
SET(OPENJP3D_SRCS
|
||||
bio.c cio.c dwt.c event.c jp3d.c jp3d_lib.c mct.c mqc.c openjpeg.c pi.c raw.c t1.c t1_3d.c t2.c tcd.c tgt.c volume.c
|
||||
)
|
||||
|
||||
|
|
@ -14,24 +14,24 @@ IF(WIN32)
|
|||
ADD_DEFINITIONS(-DOPJ_STATIC)
|
||||
ENDIF(BUILD_SHARED_LIBS)
|
||||
ENDIF(WIN32)
|
||||
ADD_LIBRARY(${OPENJPEG3D_LIBRARY_NAME} ${OPENJPEG3D_SRCS})
|
||||
ADD_LIBRARY(${OPENJP3D_LIBRARY_NAME} ${OPENJP3D_SRCS})
|
||||
IF(UNIX)
|
||||
TARGET_LINK_LIBRARIES(${OPENJPEG3D_LIBRARY_NAME} m)
|
||||
TARGET_LINK_LIBRARIES(${OPENJP3D_LIBRARY_NAME} m)
|
||||
ENDIF(UNIX)
|
||||
SET_TARGET_PROPERTIES(${OPENJPEG3D_LIBRARY_NAME} PROPERTIES ${OPENJPEG3D_LIBRARY_PROPERTIES})
|
||||
SET_TARGET_PROPERTIES(${OPENJP3D_LIBRARY_NAME} PROPERTIES ${OPENJP3D_LIBRARY_PROPERTIES})
|
||||
|
||||
# Install library
|
||||
INSTALL(TARGETS ${OPENJPEG3D_LIBRARY_NAME}
|
||||
EXPORT OpenJPEG3DTargets
|
||||
DESTINATION ${OPENJPEG3D_INSTALL_LIB_DIR}
|
||||
INSTALL(TARGETS ${OPENJP3D_LIBRARY_NAME}
|
||||
EXPORT OpenJP3DTargets
|
||||
DESTINATION ${OPENJP3D_INSTALL_LIB_DIR}
|
||||
COMPONENT Libraries
|
||||
)
|
||||
|
||||
# Install includes files
|
||||
INSTALL(FILES openjpeg3d.h
|
||||
DESTINATION ${OPENJPEG3D_INSTALL_INCLUDE_DIR}/${subdir}
|
||||
INSTALL(FILES openjp3d.h
|
||||
DESTINATION ${OPENJP3D_INSTALL_INCLUDE_DIR}/${subdir}
|
||||
COMPONENT Headers
|
||||
)
|
||||
INSTALL(CODE
|
||||
"EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ${subdir}/openjpeg3d.h \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${OPENJPEG3D_INSTALL_INCLUDE_DIR}/openjpeg3d.h)")
|
||||
"EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ${subdir}/openjp3d.h \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${OPENJP3D_INSTALL_INCLUDE_DIR}/openjp3d.h)")
|
||||
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in
|
|||
|
||||
lib_LTLIBRARIES = libopenjp3dvm.la
|
||||
|
||||
includesdir = ${includedir}/openjpeg3d-@JP3D_MAJOR_NR@.@JP3D_MINOR_NR@
|
||||
includes_HEADERS = openjpeg3d.h
|
||||
includesdir = ${includedir}/openjp3d-@JP3D_MAJOR_NR@.@JP3D_MINOR_NR@
|
||||
includes_HEADERS = openjp3d.h
|
||||
|
||||
libopenjp3dvm_la_LDFLAGS = -no-undefined -version-info @lt_version_jp3d@
|
||||
|
||||
|
|
@ -56,17 +56,17 @@ CMakeLists.txt
|
|||
|
||||
install-data-hook:
|
||||
cd $(DESTDIR)$(includedir) && \
|
||||
rm -f openjpeg3d.h && \
|
||||
$(LN_S) openjpeg3d-@JP3D_MAJOR_NR@.@JP3D_MINOR_NR@/openjpeg3d.h \
|
||||
openjpeg3d.h
|
||||
rm -f openjp3d.h && \
|
||||
$(LN_S) openjp3d-@JP3D_MAJOR_NR@.@JP3D_MINOR_NR@/openjp3d.h \
|
||||
openjp3d.h
|
||||
@echo -e " (LA)\t$(libdir)/libopenjp3dvm.la" >> $(top_builddir)/report.txt
|
||||
@( $(call solist) ) >> $(top_builddir)/report.txt
|
||||
@echo -e " (A)\t$(base)/$(a)" >> $(top_builddir)/report.txt
|
||||
@echo -e " (H)\t$(includedir)/openjpeg3d-$(MAJOR_NR).$(MINOR_NR)/openjpeg3d.h" >> $(top_builddir)/report.txt
|
||||
@echo -e " (LN)\t$(includedir)/openjpeg3d.h" >> $(top_builddir)/report.txt
|
||||
@echo -e " (H)\t$(includedir)/openjp3d-$(MAJOR_NR).$(MINOR_NR)/openjp3d.h" >> $(top_builddir)/report.txt
|
||||
@echo -e " (LN)\t$(includedir)/openjp3d.h" >> $(top_builddir)/report.txt
|
||||
|
||||
uninstall-hook:
|
||||
rm -f $(DESTDIR)$(includedir)/openjpeg3d.h
|
||||
rm -f $(DESTDIR)$(includedir)/openjp3d.h
|
||||
|
||||
solist = $(foreach f, $(dll) $(so), echo -e ' $(SO_PREFIX)\t$(base)/$(f)' ;)
|
||||
get_tok = $(shell grep -E "^$(1)=" $(lib_LTLIBRARIES) | cut -d "'" -f 2)
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ The functions in CIO.C have for goal to realize a byte input / output process.
|
|||
/** @defgroup CIO CIO - byte input-output stream */
|
||||
/*@{*/
|
||||
|
||||
/** @name Funciones generales (see also openjpeg3d.h) */
|
||||
/** @name Funciones generales (see also openjp3d.h) */
|
||||
/*@{*/
|
||||
/* ----------------------------------------------------------------------- */
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ The functions in EVENT.C have for goal to send output messages (errors, warnings
|
|||
/** @defgroup EVENT EVENT - Implementation of a event callback system */
|
||||
/*@{*/
|
||||
|
||||
/** @name Funciones generales (see also openjpeg3d.h) */
|
||||
/** @name Funciones generales (see also openjp3d.h) */
|
||||
/*@{*/
|
||||
/* ----------------------------------------------------------------------- */
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ The functions in INT.H have for goal to realize operations on integers.
|
|||
/** @defgroup INT INT - Implementation of operations on integers */
|
||||
/*@{*/
|
||||
|
||||
/** @name Funciones generales (see also openjpeg3d.h) */
|
||||
/** @name Funciones generales (see also openjp3d.h) */
|
||||
/*@{*/
|
||||
/* ----------------------------------------------------------------------- */
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@
|
|||
OpenJPEG interface
|
||||
==========================================================
|
||||
*/
|
||||
#include "openjpeg3d.h"
|
||||
#include "openjp3d.h"
|
||||
|
||||
/*
|
||||
==========================================================
|
||||
|
|
|
|||
Loading…
Reference in New Issue