Skip to content

Commit

Permalink
Merge pull request ESMCI#1754 from NCAR/ejh_release
Browse files Browse the repository at this point in the history
changed version numbers and so library numbers
  • Loading branch information
edwardhartnett authored Sep 16, 2020
2 parents fd8b8c1 + 9efeee4 commit 6f9fb5e
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ project (PIO C Fortran)
# The project version number.
set(VERSION_MAJOR 2 CACHE STRING "Project major version number.")
set(VERSION_MINOR 5 CACHE STRING "Project minor version number.")
set(VERSION_PATCH 1 CACHE STRING "Project patch version number.")
set(VERSION_PATCH 2 CACHE STRING "Project patch version number.")
mark_as_advanced(VERSION_MAJOR VERSION_MINOR VERSION_PATCH)

# Create version info in autotools parlance for pio_meta.h.
Expand Down
6 changes: 3 additions & 3 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@
## Ed Hartnett 8/16/17

# Initialize autoconf and automake.
AC_INIT(pio, 2.5.1-development)
AC_INIT(pio, 2.5.2)
AC_CONFIG_SRCDIR(src/clib/pio_darray.c)
AM_INIT_AUTOMAKE([foreign serial-tests])

# The PIO version, again. Use AC_SUBST for pio_meta.h and
# AC_DEFINE_UNQUOTED for config.h.
AC_SUBST([PIO_VERSION_MAJOR]) PIO_VERSION_MAJOR=2
AC_SUBST([PIO_VERSION_MINOR]) PIO_VERSION_MINOR=5
AC_SUBST([PIO_VERSION_PATCH]) PIO_VERSION_PATCH=1
AC_SUBST([PIO_VERSION_PATCH]) PIO_VERSION_PATCH=2
AC_DEFINE_UNQUOTED([PIO_VERSION_MAJOR], [$PIO_VERSION_MAJOR], [PIO major version])
AC_DEFINE_UNQUOTED([PIO_VERSION_MINOR], [$PIO_VERSION_MINOR], [PIO minor version])
AC_DEFINE_UNQUOTED([PIO_VERSION_PATCH], [$PIO_VERSION_PATCH], [PIO patch version])

# Once more for the documentation.
AC_SUBST([VERSION_MAJOR], [2])
AC_SUBST([VERSION_MINOR], [5])
AC_SUBST([VERSION_PATCH], [1])
AC_SUBST([VERSION_PATCH], [2])

# The m4 directory holds macros for autoconf.
AC_CONFIG_MACRO_DIR([m4])
Expand Down
2 changes: 1 addition & 1 deletion src/clib/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ endif # BUILD_NCINT
# These linker flags specify libtool version info.
# See http://www.gnu.org/software/libtool/manual/libtool.html#Libtool-versioning
# for information regarding incrementing `-version-info`.
libpioc_la_LDFLAGS = -version-info 4:1:3
libpioc_la_LDFLAGS = -version-info 5:0:0

# The library header file will be installed in include dir.
include_HEADERS = pio.h uthash.h pio_meta.h
Expand Down
2 changes: 1 addition & 1 deletion src/flib/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ lib_LTLIBRARIES = libpiof.la
# These linker flags specify libtool version info.
# See http://www.gnu.org/software/libtool/manual/libtool.html#Libtool-versioning
# for information regarding incrementing `-version-info`.
libpiof_la_LDFLAGS = -version-info 3:1:2
libpiof_la_LDFLAGS = -version-info 4:0:0

# The library soure files.
libpiof_la_LIBADD = libpio_nf.la libpio_kinds.la libpio_support.la \
Expand Down

0 comments on commit 6f9fb5e

Please sign in to comment.