From 15936cde8c9e13fe4a6a00f94b53aeee6dde2fa2 Mon Sep 17 00:00:00 2001 From: Johan Mabille Date: Tue, 10 Jan 2017 18:10:09 +0100 Subject: [PATCH] setting cppzmq version to the one of libzmq --- CMakeLists.txt | 10 +--------- zmq.hpp | 4 ---- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 077ff65..7524022 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,15 +3,7 @@ project(cppzmq) find_package(ZeroMQ REQUIRED) -file(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/zmq.hpp" cppzmq_version_defines - REGEX "#define CPPZMQ_VERSION_(MAJOR|MINOR|PATCH)") -foreach(ver ${cppzmq_version_defines}) - if(ver MATCHES "#define CPPZMQ_VERSION_(MAJOR|MINOR|PATCH) +([^ ]+)$") - set(CPPZMQ_VERSION_${CMAKE_MATCH_1} "${CMAKE_MATCH_2}" CACHE INTERNAL "") - endif() -endforeach() -set(${PROJECT_NAME}_VERSION - ${CPPZMQ_VERSION_MAJOR}.${CPPZMQ_VERSION_MINOR}.${CPPZMQ_VERSION_PATCH}) +set (${PROJECT_NAME}_VERSION ${ZeroMQ_VERSION}) message(STATUS "cppzmq v${${PROJECT_NAME}_VERSION}") set(CPPZMQ_HEADERS diff --git a/zmq.hpp b/zmq.hpp index 9de8012..9a84bb3 100644 --- a/zmq.hpp +++ b/zmq.hpp @@ -107,10 +107,6 @@ typedef struct { # define ZMQ_ASSERT(expression) (void)(expression) #endif -#define CPPZMQ_VERSION_MAJOR 1 -#define CPPZMQ_VERSION_MINOR 0 -#define CPPZMQ_VERSION_PATCH 0 - namespace zmq {