diff --git a/CMakeLists.txt b/CMakeLists.txt index 38def468..f73baf8c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,13 +19,14 @@ if (WITH_OPENPGM) # set(OPENPGM_ROOT "" CACHE PATH "Location of OpenPGM") set(OPENPGM_VERSION_MAJOR 5) set(OPENPGM_VERSION_MINOR 2) - set(OPENPGM_VERSION_MICRO 121) + set(OPENPGM_VERSION_MICRO 122) if (CMAKE_CL_64) find_path(OPENPGM_ROOT include/pgm/pgm.h PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Miru\\OpenPGM ${OPENPGM_VERSION_MAJOR}.${OPENPGM_VERSION_MINOR}.${OPENPGM_VERSION_MICRO}]" NO_DEFAULT_PATH ) + message(STATUS "OpenPGM x64 detected - ${OPENPGM_ROOT}") else (CMAKE_CL_64) find_path(OPENPGM_ROOT include/pgm/pgm.h PATHS @@ -33,8 +34,8 @@ if (WITH_OPENPGM) "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Miru\\OpenPGM ${OPENPGM_VERSION_MAJOR}.${OPENPGM_VERSION_MINOR}.${OPENPGM_VERSION_MICRO}]" NO_DEFAULT_PATH ) + message(STATUS "OpenPGM x86 detected - ${OPENPGM_ROOT}") endif (CMAKE_CL_64) - message(STATUS "OpenPGM detected - ${OPENPGM_ROOT}") set(OPENPGM_INCLUDE_DIRS ${OPENPGM_ROOT}/include) set(OPENPGM_LIBRARY_DIRS ${OPENPGM_ROOT}/lib) set(OPENPGM_LIBRARIES diff --git a/configure.in b/configure.in index 60416ff5..72d75f8d 100644 --- a/configure.in +++ b/configure.in @@ -284,7 +284,7 @@ AC_C_VOLATILE # PGM extension libzmq_pgm_ext="no" -pgm_basename="libpgm-5.1.118~dfsg" +pgm_basename="libpgm-5.2.122~dfsg" AC_ARG_WITH([pgm], [AS_HELP_STRING([--with-pgm], [build libzmq with PGM extension [default=no]])], diff --git a/foreign/openpgm/libpgm-5.1.118~dfsg.tar.gz b/foreign/openpgm/libpgm-5.1.118~dfsg.tar.gz deleted file mode 100644 index 92f1707a..00000000 Binary files a/foreign/openpgm/libpgm-5.1.118~dfsg.tar.gz and /dev/null differ diff --git a/foreign/openpgm/libpgm-5.2.122~dfsg.tar.gz b/foreign/openpgm/libpgm-5.2.122~dfsg.tar.gz new file mode 100755 index 00000000..410af0aa Binary files /dev/null and b/foreign/openpgm/libpgm-5.2.122~dfsg.tar.gz differ