From 99a3f1d8401a9a0e8e3c7b7b9cdfbce7ed9ea00f Mon Sep 17 00:00:00 2001
From: Jason Rhinelander <jason@imaginary.ca>
Date: Thu, 15 Apr 2021 15:14:36 -0300
Subject: [PATCH] Bump (and cmake-modernize) version

---
 CMakeLists.txt      | 10 ++++------
 liblokimq.pc.in     |  2 +-
 liboxenmq.pc.in     |  2 +-
 oxenmq/version.h.in |  6 +++---
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6c09cec..68926f8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,15 +16,13 @@ cmake_minimum_required(VERSION 3.7)
 # Has to be set before `project()`, and ignored on non-macos:
 set(CMAKE_OSX_DEPLOYMENT_TARGET 10.12 CACHE STRING "macOS deployment target (Apple clang only)")
 
-project(liboxenmq CXX C)
+project(liboxenmq
+    VERSION 1.2.5
+    LANGUAGES CXX C)
 
 include(GNUInstallDirs)
 
-set(OXENMQ_VERSION_MAJOR 1)
-set(OXENMQ_VERSION_MINOR 2)
-set(OXENMQ_VERSION_PATCH 4)
-set(OXENMQ_VERSION "${OXENMQ_VERSION_MAJOR}.${OXENMQ_VERSION_MINOR}.${OXENMQ_VERSION_PATCH}")
-message(STATUS "oxenmq v${OXENMQ_VERSION}")
+message(STATUS "oxenmq v${PROJECT_VERSION}")
 
 set(OXENMQ_LIBVERSION 0)
 
diff --git a/liblokimq.pc.in b/liblokimq.pc.in
index 3c707a6..9009f42 100644
--- a/liblokimq.pc.in
+++ b/liblokimq.pc.in
@@ -5,7 +5,7 @@ includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
 
 Name: liblokimq
 Description: ZeroMQ-based communication library (compatibility package for liboxenmq)
-Version: @OXENMQ_VERSION@
+Version: @PROJECT_VERSION@
 
 Libs: -L${libdir} -loxenmq
 Libs.private: @PRIVATE_LIBS@
diff --git a/liboxenmq.pc.in b/liboxenmq.pc.in
index 0f7c3e1..c05d8f7 100644
--- a/liboxenmq.pc.in
+++ b/liboxenmq.pc.in
@@ -5,7 +5,7 @@ includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
 
 Name: liboxenmq
 Description: ZeroMQ-based communication library
-Version: @OXENMQ_VERSION@
+Version: @PROJECT_VERSION@
 
 Libs: -L${libdir} -loxenmq
 Libs.private: @PRIVATE_LIBS@
diff --git a/oxenmq/version.h.in b/oxenmq/version.h.in
index a5d6aec..7babbca 100644
--- a/oxenmq/version.h.in
+++ b/oxenmq/version.h.in
@@ -1,5 +1,5 @@
 namespace oxenmq {
-constexpr int VERSION_MAJOR = @OXENMQ_VERSION_MAJOR@;
-constexpr int VERSION_MINOR = @OXENMQ_VERSION_MINOR@;
-constexpr int VERSION_PATCH = @OXENMQ_VERSION_PATCH@;
+constexpr int VERSION_MAJOR = @PROJECT_VERSION_MAJOR@;
+constexpr int VERSION_MINOR = @PROJECT_VERSION_MINOR@;
+constexpr int VERSION_PATCH = @PROJECT_VERSION_PATCH@;
 }