Pull upstream OpenPGM 5.2.122 for multi-platform minor fixes.

strattond · Dec 12, 2012 · 2e9d4d4 · 2e9d4d4
1 parent 4febe88
commit 2e9d4d4
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -19,22 +19,23 @@ 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
 			"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\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
 			)
+		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
@@ -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
diff --git a/foreign/openpgm/libpgm-5.2.122~dfsg.tar.gz b/foreign/openpgm/libpgm-5.2.122~dfsg.tar.gz