generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-13 10:52:56 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #488 from steve-o/openpgm-next

Browse Source 
Pull upstream OpenPGM 5.2.122 for multi-platform minor fixes.
This commit is contained in:
Pieter Hintjens 2012-12-11 22:34:52 -08:00
commit ce24557b11
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -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

2
configure.in
View File

@ -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]])],

BIN
foreign/openpgm/libpgm-5.1.118~dfsg.tar.gz
View File

Binary file not shown.

BIN
foreign/openpgm/libpgm-5.2.122~dfsg.tar.gz Executable file
View File

Binary file not shown.