Skip to content

Commit

Permalink
Updated openexr version to 2.2.1, resynced the .so version number to …
Browse files Browse the repository at this point in the history
…23 across all projects.
  • Loading branch information
nickrasmussen committed Nov 17, 2017
1 parent 49db4a4 commit e69de40
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 30 deletions.
2 changes: 1 addition & 1 deletion Contrib/DtexToExr/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ AM_INIT_AUTOMAKE(1.6.3) dnl Require automake 1.6.3 or better
AM_MAINTAINER_MODE


LIBTOOL_CURRENT=6
LIBTOOL_CURRENT=23
LIBTOOL_REVISION=0
LIBTOOL_AGE=0
LIBTOOL_VERSION=$LIBTOOL_CURRENT:$LIBTOOL_REVISION:$LIBTOOL_AGE
Expand Down
22 changes: 11 additions & 11 deletions IlmBase/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ PROJECT ( ilmbase )

SET(ILMBASE_VERSION_MAJOR "2")
SET(ILMBASE_VERSION_MINOR "2")
SET(ILMBASE_VERSION_PATCH "0")
SET(ILMBASE_VERSION_PATCH "1")

SET(ILMBASE_VERSION ${ILMBASE_VERSION_MAJOR}.${ILMBASE_VERSION_MINOR}.${ILMBASE_VERSION_PATCH})
SET(ILMBASE_VERSION_API ${ILMBASE_VERSION_MAJOR}_${ILMBASE_VERSION_MINOR})
Expand Down Expand Up @@ -160,31 +160,31 @@ ENDIF ()

SET_TARGET_PROPERTIES ( Half
PROPERTIES
VERSION 12.0.0
SOVERSION 12
VERSION 23.0.0
SOVERSION 23
)
SET_TARGET_PROPERTIES ( Iex
PROPERTIES
VERSION 12.0.0
SOVERSION 12
VERSION 23.0.0
SOVERSION 23
OUTPUT_NAME "Iex${ILMBASE_LIBSUFFIX}"
)
SET_TARGET_PROPERTIES ( Imath
PROPERTIES
VERSION 12.0.0
SOVERSION 12
VERSION 23.0.0
SOVERSION 23
OUTPUT_NAME "Imath${ILMBASE_LIBSUFFIX}"
)
SET_TARGET_PROPERTIES ( IlmThread
PROPERTIES
VERSION 12.0.0
SOVERSION 12
VERSION 23.0.0
SOVERSION 23
OUTPUT_NAME "IlmThread${ILMBASE_LIBSUFFIX}"
)
SET_TARGET_PROPERTIES ( IexMath
PROPERTIES
VERSION 12.0.0
SOVERSION 12
VERSION 23.0.0
SOVERSION 23
OUTPUT_NAME "IexMath${ILMBASE_LIBSUFFIX}"
)

Expand Down
6 changes: 3 additions & 3 deletions IlmBase/configure.ac
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(IlmBase, 2.2.0)
AC_INIT(IlmBase, 2.2.1)

AC_SUBST(ILMBASE_VERSION_MAJOR, 2)
AC_SUBST(ILMBASE_VERSION_MINOR, 2)
AC_SUBST(ILMBASE_VERSION_PATCH, 0)
AC_SUBST(ILMBASE_VERSION_PATCH, 1)

AC_SUBST(ILMBASE_VERSION, ${ILMBASE_VERSION_MAJOR}.${ILMBASE_VERSION_MINOR}.${ILMBASE_VERSION_PATCH})
AC_SUBST(ILMBASE_VERSION_API, ${ILMBASE_VERSION_MAJOR}_${ILMBASE_VERSION_MINOR})
Expand All @@ -15,7 +15,7 @@ AM_INIT_AUTOMAKE(1.6.3) dnl Require automake 1.6.3 or better
AM_MAINTAINER_MODE


LIBTOOL_CURRENT=12
LIBTOOL_CURRENT=23
LIBTOOL_REVISION=0
LIBTOOL_AGE=0
LIBTOOL_VERSION=$LIBTOOL_CURRENT:$LIBTOOL_REVISION:$LIBTOOL_AGE
Expand Down
8 changes: 4 additions & 4 deletions OpenEXR/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,8 @@ ADD_SUBDIRECTORY ( IlmImf )

SET_TARGET_PROPERTIES ( IlmImf
PROPERTIES
VERSION 22.0.0
SOVERSION 22
VERSION 23.0.0
SOVERSION 23
OUTPUT_NAME "IlmImf${OPENEXR_LIBSUFFIX}"
)

Expand All @@ -184,8 +184,8 @@ ADD_SUBDIRECTORY ( IlmImfUtil )

SET_TARGET_PROPERTIES ( IlmImfUtil
PROPERTIES
VERSION 22.0.0
SOVERSION 22
VERSION 23.0.0
SOVERSION 23
OUTPUT_NAME "IlmImfUtil${OPENEXR_LIBSUFFIX}"
)

Expand Down
6 changes: 3 additions & 3 deletions OpenEXR/configure.ac
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
dnl Process this file with autoconf to produce a configure script.

AC_INIT(OpenEXR, 2.2.0)
AC_INIT(OpenEXR, 2.2.1)

AC_SUBST(OPENEXR_VERSION_MAJOR, 2)
AC_SUBST(OPENEXR_VERSION_MINOR, 2)
AC_SUBST(OPENEXR_VERSION_PATCH, 0)
AC_SUBST(OPENEXR_VERSION_PATCH, 1)

AC_SUBST(OPENEXR_VERSION, ${OPENEXR_VERSION_MAJOR}.${OPENEXR_VERSION_MINOR}.${OPENEXR_VERSION_PATCH})
AC_SUBST(OPENEXR_VERSION_API, ${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR})
Expand All @@ -16,7 +16,7 @@ AM_INIT_AUTOMAKE(1.6.3) dnl Require automake 1.6.3 or better
AM_MAINTAINER_MODE


LIBTOOL_CURRENT=22
LIBTOOL_CURRENT=23
LIBTOOL_REVISION=0
LIBTOOL_AGE=0
LIBTOOL_VERSION=$LIBTOOL_CURRENT:$LIBTOOL_REVISION:$LIBTOOL_AGE
Expand Down
8 changes: 4 additions & 4 deletions OpenEXR_Viewers/configure.ac
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(OpenEXR_Viewers, 2.2.0)
AC_SUBST(OPENEXR_VIEWERS_VERSION, 2.2.0)
AC_INIT(OpenEXR_Viewers, 2.2.1)
AC_SUBST(OPENEXR_VIEWERS_VERSION, 2.2.1)
AC_CANONICAL_HOST
AC_CONFIG_SRCDIR(playexr/main.cpp)
AM_CONFIG_HEADER(config/OpenEXR_ViewersConfig.h)
AM_INIT_AUTOMAKE(1.6.3) dnl Require automake 1.6.3 or better
AM_MAINTAINER_MODE


LIBTOOL_CURRENT=6
LIBTOOL_REVISION=1
LIBTOOL_CURRENT=23
LIBTOOL_REVISION=0
LIBTOOL_AGE=0
LIBTOOL_VERSION=$LIBTOOL_CURRENT:$LIBTOOL_REVISION:$LIBTOOL_AGE
AC_SUBST(LIBTOOL_VERSION)
Expand Down
8 changes: 4 additions & 4 deletions PyIlmBase/configure.ac
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(PyIlmBase, 2.2.0)
AC_SUBST(PYILMBASE_VERSION, 2.2.0)
AC_INIT(PyIlmBase, 2.2.1)
AC_SUBST(PYILMBASE_VERSION, 2.2.1)
AC_CANONICAL_HOST
AC_CONFIG_SRCDIR(PyIex/iexmodule.cpp)
AC_CONFIG_HEADER(config/PyIlmBaseConfig.h)
Expand All @@ -10,8 +10,8 @@ dnl static python modules make no sense - disable static
AC_DISABLE_STATIC


LIBTOOL_CURRENT=2
LIBTOOL_REVISION=2
LIBTOOL_CURRENT=23
LIBTOOL_REVISION=0
LIBTOOL_AGE=0
LIBTOOL_VERSION=$LIBTOOL_CURRENT:$LIBTOOL_REVISION:$LIBTOOL_AGE
AC_SUBST(LIBTOOL_VERSION)
Expand Down

0 comments on commit e69de40

Please sign in to comment.