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

BUG: Fix previous patch from Callum Lerwick. I have no clue what CMAKE_INSTALL_LIBDIR refers too. Bump up cmake 2.2 restriction to cmake 2.4 because of previous patch not backward compatible. Properly set the SOVERSION in a cross plateform way (yes WIN32 is a plateform)

This commit is contained in:
Mathieu Malaterre 2007-09-25 14:54:49 +00:00
parent 7e40a9475a
commit 6265dcfb11
3 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
CMakeLists.txt
View File

@ -8,7 +8,7 @@
# e.g.: # e.g.:
# SET(OPENJPEG_NAMESPACE "GDCMOPENJPEG") # SET(OPENJPEG_NAMESPACE "GDCMOPENJPEG")
PROJECT(OPENJPEG C) PROJECT(OPENJPEG C)
CMAKE_MINIMUM_REQUIRED(VERSION 2.2) CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
IF(NOT OPENJPEG_NAMESPACE) IF(NOT OPENJPEG_NAMESPACE)
SET(OPENJPEG_NAMESPACE "OPENJPEG") SET(OPENJPEG_NAMESPACE "OPENJPEG")
@ -23,13 +23,20 @@ PROJECT(${JPEG_NAMESPACE} C)
INCLUDE_REGULAR_EXPRESSION("^.*$") INCLUDE_REGULAR_EXPRESSION("^.*$")
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# OPENJPEG version number, usefull for packaging and doxygen doc: # OPENJPEG version number, useful for packaging and doxygen doc:
SET(OPENJPEG_SOVERSION 2) SET(OPENJPEG_VERSION_MAJOR 1)
SET(OPENJPEG_MAJOR_VERSION 1) SET(OPENJPEG_VERSION_MINOR 2)
SET(OPENJPEG_MINOR_VERSION 2) SET(OPENJPEG_VERSION_BUILD 0)
SET(OPENJPEG_BUILD_VERSION 0)
SET(OPENJPEG_VERSION SET(OPENJPEG_VERSION
"${OPENJPEG_MAJOR_VERSION}.${OPENJPEG_MINOR_VERSION}.${OPENJPEG_BUILD_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}"
)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# OpenJPEG build configuration options. # OpenJPEG build configuration options.
@ -109,7 +116,3 @@ FIND_PATH(JPEG2000_CONFORMANCE_DATA_ROOT testimages.html
$ENV{JPEG2000_CONFORMANCE_DATA_ROOT} $ENV{JPEG2000_CONFORMANCE_DATA_ROOT}
) )
IF(CMAKE_COMPILER_IS_GNUCC)
SET(CMAKE_WARN_FLAGS "-Wall -Wextra -Wshadow -Wcast-align -Wstrict-prototypes -Wold-style-definition -Wdisabled-optimization -Wfloat-equal")
SET(CMAKE_C_FLAGS "${CMAKE_WARN_FLAGS} -ffast-math -fstrict-aliasing -std=c99 ${CMAKE_C_FLAGS}")
ENDIF(CMAKE_COMPILER_IS_GNUCC)

5
ChangeLog
View File

@ -5,6 +5,11 @@ What's New for OpenJPEG
! : changed ! : changed
+ : added + : added
September 25, 2007
* [Mathieu Malaterre] BUG: Fix previous patch from Callum Lerwick. I have no
clue what CMAKE_INSTALL_LIBDIR refers too. Bump up cmake 2.2 restriction to
cmake 2.4 because of previous patch (not backward compatible). Properly set the SOVERSION in a cross plateform way (yes WIN32 is a platform)
September 19, 2007 September 19, 2007
* [Parvatha] Fixed issues with generation of SOP marker. * [Parvatha] Fixed issues with generation of SOP marker.

5
libopenjpeg/CMakeLists.txt
View File

@ -33,12 +33,11 @@ ENDIF(WIN32)
# Create the library # Create the library
ADD_LIBRARY(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS}) ADD_LIBRARY(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS})
SET_TARGET_PROPERTIES(${OPENJPEG_LIBRARY_NAME} PROPERTIES SET_TARGET_PROPERTIES(${OPENJPEG_LIBRARY_NAME} PROPERTIES
SOVERSION ${OPENJPEG_SOVERSION} ${OPENJPEG_LIBRARY_PROPERTIES})
VERSION ${OPENJPEG_SOVERSION}.${OPENJPEG_VERSION})
# Install library # Install library
INSTALL(TARGETS ${OPENJPEG_LIBRARY_NAME} INSTALL(TARGETS ${OPENJPEG_LIBRARY_NAME}
DESTINATION ${CMAKE_INSTALL_LIBDIR}) DESTINATION lib)
# Install includes files # Install includes files
INSTALL(FILES openjpeg.h INSTALL(FILES openjpeg.h