Start using cmake API for easy packaging
This commit is contained in:
parent
0c69d6e1a8
commit
ecd70f033c
|
@ -0,0 +1,48 @@
|
||||||
|
#-----------------------------------------------------------------------------
|
||||||
|
#
|
||||||
|
# OPENJPEGConfig.cmake - CMake configuration file for external projects.
|
||||||
|
#
|
||||||
|
# This file is configured by OPENJPEG and used by the UseOPENJPEG.cmake
|
||||||
|
# module to load OPENJPEG's settings for an external project.
|
||||||
|
@OPENJPEG_CONFIG_INSTALL_ONLY@
|
||||||
|
# The OPENJPEG version number.
|
||||||
|
SET(OPENJPEG_MAJOR_VERSION "@OPENJPEG_VERSION_MAJOR@")
|
||||||
|
SET(OPENJPEG_MINOR_VERSION "@OPENJPEG_VERSION_MINOR@")
|
||||||
|
SET(OPENJPEG_BUILD_VERSION "@OPENJPEG_VERSION_BUILD@")
|
||||||
|
|
||||||
|
# The libraries.
|
||||||
|
SET(OPENJPEG_LIBRARIES "@OPENJPEG_LIBRARIES@")
|
||||||
|
|
||||||
|
# The CMake macros dir.
|
||||||
|
SET(OPENJPEG_CMAKE_DIR "@OPENJPEG_CMAKE_DIR_CONFIG@")
|
||||||
|
|
||||||
|
# The configuration options.
|
||||||
|
SET(OPENJPEG_BUILD_SHARED_LIBS "@OPENJPEG_BUILD_SHARED_LIBS@")
|
||||||
|
|
||||||
|
# The "use" file.
|
||||||
|
SET(OPENJPEG_USE_FILE "@OPENJPEG_USE_FILE_CONFIG@")
|
||||||
|
|
||||||
|
get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
|
||||||
|
if(EXISTS ${SELF_DIR}/OPENJPEGTargets.cmake)
|
||||||
|
# This is an install tree
|
||||||
|
include(${SELF_DIR}/OPENJPEGTargets.cmake)
|
||||||
|
get_filename_component(OPENJPEG_INCLUDE_ROOT "${SELF_DIR}/../../@OPENJPEG_INSTALL_INCLUDE_DIR@" ABSOLUTE)
|
||||||
|
set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG_INCLUDE_ROOT})
|
||||||
|
|
||||||
|
else(EXISTS ${SELF_DIR}/OPENJPEGTargets.cmake)
|
||||||
|
if(EXISTS ${SELF_DIR}/OPENJPEGExports.cmake)
|
||||||
|
# This is a build tree
|
||||||
|
SET( OPENJPEG_INCLUDE_DIRS @OPENJPEG_INCLUDE_PATH@)
|
||||||
|
|
||||||
|
include(${SELF_DIR}/OPENJPEGExports.cmake)
|
||||||
|
|
||||||
|
else(EXISTS ${SELF_DIR}/OPENJPEGExports.cmake)
|
||||||
|
message(FATAL_ERROR "ooops")
|
||||||
|
endif(EXISTS ${SELF_DIR}/OPENJPEGExports.cmake)
|
||||||
|
endif(EXISTS ${SELF_DIR}/OPENJPEGTargets.cmake)
|
||||||
|
|
||||||
|
set(OPENJPEG_USE_FILE ${SELF_DIR}/UseOPENJPEG.cmake)
|
||||||
|
|
||||||
|
# Backward compatible part:
|
||||||
|
SET(OPENJPEG_FOUND TRUE)
|
||||||
|
|
|
@ -71,6 +71,11 @@ IF(NOT OPENJPEG_INSTALL_DOC_DIR)
|
||||||
SET(OPENJPEG_INSTALL_DOC_DIR "share/doc/${subdir}")
|
SET(OPENJPEG_INSTALL_DOC_DIR "share/doc/${subdir}")
|
||||||
ENDIF(NOT OPENJPEG_INSTALL_DOC_DIR)
|
ENDIF(NOT OPENJPEG_INSTALL_DOC_DIR)
|
||||||
|
|
||||||
|
IF(NOT OPENJPEG_INSTALL_PACKAGE_DIR)
|
||||||
|
SET(OPENJPEG_INSTALL_PACKAGE_DIR ${OPENJPEG_INSTALL_LIB_DIR}/${subdir}
|
||||||
|
CACHE INTERNAL "")
|
||||||
|
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)
|
||||||
|
@ -176,3 +181,13 @@ IF(CMAKE_COMPILER_IS_GNUCC)
|
||||||
SET(CMAKE_C_FLAGS_RELEASE "-ffast-math ${CMAKE_C_FLAGS_RELEASE}")
|
SET(CMAKE_C_FLAGS_RELEASE "-ffast-math ${CMAKE_C_FLAGS_RELEASE}")
|
||||||
ENDIF(CMAKE_COMPILER_IS_GNUCC)
|
ENDIF(CMAKE_COMPILER_IS_GNUCC)
|
||||||
|
|
||||||
|
# install all targets referenced as OPENJPEGTargets
|
||||||
|
install(EXPORT OpenJPEGTargets DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR})
|
||||||
|
CONFIGURE_FILE( ${OPENJPEG_SOURCE_DIR}/CMake/OpenJPEGConfig.cmake.in
|
||||||
|
${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake
|
||||||
|
@ONLY
|
||||||
|
)
|
||||||
|
INSTALL( FILES ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake
|
||||||
|
DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR}
|
||||||
|
)
|
||||||
|
|
||||||
|
|
|
@ -11,6 +11,7 @@ Jun 21, 2010
|
||||||
* [MM] j2k_to_image properly return error code
|
* [MM] j2k_to_image properly return error code
|
||||||
* [MM] increase coverage by testing all codecs
|
* [MM] increase coverage by testing all codecs
|
||||||
* [MM] fix installation. Place in subfolder to handle both API
|
* [MM] fix installation. Place in subfolder to handle both API
|
||||||
|
* [MM] Start using cmake API for easy packaging
|
||||||
|
|
||||||
April 8, 2010
|
April 8, 2010
|
||||||
* [FOD] Fixed problem with Borland C++ Builder (Borland C do not have lrintf). Thanks Marek Mauder for this fix.
|
* [FOD] Fixed problem with Borland C++ Builder (Borland C do not have lrintf). Thanks Marek Mauder for this fix.
|
||||||
|
|
|
@ -51,7 +51,10 @@ FOREACH(exe j2k_to_image image_to_j2k)
|
||||||
TARGET_LINK_LIBRARIES(${exe} m)
|
TARGET_LINK_LIBRARIES(${exe} m)
|
||||||
ENDIF(UNIX)
|
ENDIF(UNIX)
|
||||||
# Install exe
|
# Install exe
|
||||||
INSTALL_TARGETS(/bin/ ${exe})
|
INSTALL(TARGETS ${exe}
|
||||||
|
EXPORT OpenJPEGTargets
|
||||||
|
DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
|
||||||
|
)
|
||||||
ENDFOREACH(exe)
|
ENDFOREACH(exe)
|
||||||
|
|
||||||
if(BUILD_TESTING)
|
if(BUILD_TESTING)
|
||||||
|
|
|
@ -70,10 +70,11 @@ ENDIF(UNIX)
|
||||||
|
|
||||||
# Install library
|
# Install library
|
||||||
INSTALL(TARGETS ${OPENJPEG_LIBRARY_NAME}
|
INSTALL(TARGETS ${OPENJPEG_LIBRARY_NAME}
|
||||||
DESTINATION ${OPENJPEG_INSTALL_LIB_DIR}
|
EXPORT OpenJPEGTargets
|
||||||
|
DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
|
||||||
)
|
)
|
||||||
|
|
||||||
# Install includes files
|
# Install includes files
|
||||||
INSTALL(FILES openjpeg.h
|
INSTALL(FILES openjpeg.h
|
||||||
DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}
|
DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue