Skip to content

Commit

Permalink
setting cppzmq version to the one of libzmq
Browse files Browse the repository at this point in the history
  • Loading branch information
JohanMabille committed Jan 10, 2017
1 parent 33e9ab3 commit 15936cd
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 13 deletions.
10 changes: 1 addition & 9 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions zmq.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
{

Expand Down

0 comments on commit 15936cd

Please sign in to comment.