Skip to content

Commit

Permalink
Merge pull request #1915 from jedwards4b/update_version_2.5.6
Browse files Browse the repository at this point in the history
  • Loading branch information
jedwards4b authored Mar 7, 2022
2 parents f49656d + 949c4ac commit 0dbdf3b
Show file tree
Hide file tree
Showing 2 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)
# 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 5 CACHE STRING "Project patch version number.")
set(VERSION_PATCH 6 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
10 changes: 5 additions & 5 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
## Ed Hartnett 8/16/17

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

Expand All @@ -11,15 +11,15 @@ AM_INIT_AUTOMAKE([foreign serial-tests])
# 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=4
AC_SUBST([PIO_VERSION_PATCH]) PIO_VERSION_PATCH=6
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], [5])
AC_SUBST([VERSION_PATCH], [6])


# The m4 directory holds macros for autoconf.
Expand Down Expand Up @@ -108,7 +108,7 @@ AC_MSG_CHECKING([whether debug logging is enabled])
AC_ARG_ENABLE([logging],
[AS_HELP_STRING([--enable-logging],
[enable debug logging capability (will negatively impact performance). \
This debugging feature is probably only of interest to PIO developers.])])
This debugging feature is probably only of interest to PIO developers.])])
test "x$enable_logging" = xyes || enable_logging=no
AC_MSG_RESULT([$enable_logging])
if test "x$enable_logging" = xyes; then
Expand Down Expand Up @@ -469,7 +469,7 @@ AC_SUBST([HAS_PIO_FORTRAN], [$enable_fortran])
# Create the build summary file.
AC_CONFIG_FILES([libpio.settings
src/clib/pio_meta.h
])
])
AC_CONFIG_LINKS([tests/unit/input.nl:tests/unit/input.nl])

# Create the config.h file.
Expand Down

0 comments on commit 0dbdf3b

Please sign in to comment.