Commit 2e9d4d41 authored by Steven McCoy's avatar Steven McCoy

Pull upstream OpenPGM 5.2.122 for multi-platform minor fixes.

parent 4febe88b
...@@ -19,13 +19,14 @@ if (WITH_OPENPGM) ...@@ -19,13 +19,14 @@ if (WITH_OPENPGM)
# set(OPENPGM_ROOT "" CACHE PATH "Location of OpenPGM") # set(OPENPGM_ROOT "" CACHE PATH "Location of OpenPGM")
set(OPENPGM_VERSION_MAJOR 5) set(OPENPGM_VERSION_MAJOR 5)
set(OPENPGM_VERSION_MINOR 2) set(OPENPGM_VERSION_MINOR 2)
set(OPENPGM_VERSION_MICRO 121) set(OPENPGM_VERSION_MICRO 122)
if (CMAKE_CL_64) if (CMAKE_CL_64)
find_path(OPENPGM_ROOT include/pgm/pgm.h find_path(OPENPGM_ROOT include/pgm/pgm.h
PATHS PATHS
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Miru\\OpenPGM ${OPENPGM_VERSION_MAJOR}.${OPENPGM_VERSION_MINOR}.${OPENPGM_VERSION_MICRO}]" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Miru\\OpenPGM ${OPENPGM_VERSION_MAJOR}.${OPENPGM_VERSION_MINOR}.${OPENPGM_VERSION_MICRO}]"
NO_DEFAULT_PATH NO_DEFAULT_PATH
) )
message(STATUS "OpenPGM x64 detected - ${OPENPGM_ROOT}")
else (CMAKE_CL_64) else (CMAKE_CL_64)
find_path(OPENPGM_ROOT include/pgm/pgm.h find_path(OPENPGM_ROOT include/pgm/pgm.h
PATHS PATHS
...@@ -33,8 +34,8 @@ if (WITH_OPENPGM) ...@@ -33,8 +34,8 @@ if (WITH_OPENPGM)
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Miru\\OpenPGM ${OPENPGM_VERSION_MAJOR}.${OPENPGM_VERSION_MINOR}.${OPENPGM_VERSION_MICRO}]" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Miru\\OpenPGM ${OPENPGM_VERSION_MAJOR}.${OPENPGM_VERSION_MINOR}.${OPENPGM_VERSION_MICRO}]"
NO_DEFAULT_PATH NO_DEFAULT_PATH
) )
message(STATUS "OpenPGM x86 detected - ${OPENPGM_ROOT}")
endif (CMAKE_CL_64) endif (CMAKE_CL_64)
message(STATUS "OpenPGM detected - ${OPENPGM_ROOT}")
set(OPENPGM_INCLUDE_DIRS ${OPENPGM_ROOT}/include) set(OPENPGM_INCLUDE_DIRS ${OPENPGM_ROOT}/include)
set(OPENPGM_LIBRARY_DIRS ${OPENPGM_ROOT}/lib) set(OPENPGM_LIBRARY_DIRS ${OPENPGM_ROOT}/lib)
set(OPENPGM_LIBRARIES set(OPENPGM_LIBRARIES
......
...@@ -284,7 +284,7 @@ AC_C_VOLATILE ...@@ -284,7 +284,7 @@ AC_C_VOLATILE
# PGM extension # PGM extension
libzmq_pgm_ext="no" 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], AC_ARG_WITH([pgm], [AS_HELP_STRING([--with-pgm],
[build libzmq with PGM extension [default=no]])], [build libzmq with PGM extension [default=no]])],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment