From a386f1b48c63351a34366c9a8f444fdfeb1eb3e1 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sun, 3 Jan 2021 16:50:22 +0100
Subject: [PATCH] Set shared library version and bump version number to 1.5.0

See #53.
---
 CHANGELOG.md            | 3 +++
 CMakeLists.txt          | 2 +-
 README.md               | 2 +-
 include/osmpbf/osmpbf.h | 2 +-
 pom.xml                 | 2 +-
 src/CMakeLists.txt      | 2 ++
 src/Makefile            | 2 +-
 7 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe64427..4991443 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,9 @@
 ## Unreleased
 
 - C: Support hardening buildflags set in the environment ([09845ca4](https://github.com/openstreetmap/OSM-binary/commit/09845ca4087c7404b1de33914233dbf53f9de4c3))
+- C: Updated CMake configuration. This can now completely replace the configuration using the Makefiles.
+- Proto: Add optional way to add node locations to way ([e7d3201](https://github.com/openstreetmap/OSM-binary/commit/e7d3201a97a86ef0c0608bfcd960e44e54962d7b))
+- Proto: Add optional LZ4 and ZSTD compressed data blocks ([218bfe8](https://github.com/openstreetmap/OSM-binary/commit/218bfe8ed800173279ede2d9028fd9a5c33d12e4))
 
 ## Release notes for 1.4.0 (2020-10-20)
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9ffb765..69591ed 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.7)
 
-project(OSMBinary)
+project(osmpbf VERSION 1.5.0)
 
 include(GNUInstallDirs)
 
diff --git a/README.md b/README.md
index 6f5d2ba..8874ef1 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ We publish the Java library to [Maven Central](https://search.maven.org/):
 <dependency>
   <groupId>org.openstreetmap.pbf</groupId>
   <artifactId>osmpbf</artifactId>
-  <version>1.4.0</version>
+  <version>1.5.0</version>
 </dependency>
 ```
 
diff --git a/include/osmpbf/osmpbf.h b/include/osmpbf/osmpbf.h
index 977b66f..4611a30 100644
--- a/include/osmpbf/osmpbf.h
+++ b/include/osmpbf/osmpbf.h
@@ -18,7 +18,7 @@
 // this describes the high-level OSM objects
 #include <osmpbf/osmformat.pb.h> // IWYU pragma: export
 
-#define OSMPBF_VERSION "1.3.3"
+#define OSMPBF_VERSION "1.5.0"
 
 namespace OSMPBF {
 
diff --git a/pom.xml b/pom.xml
index 578cc61..000682b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   <groupId>org.openstreetmap.pbf</groupId>
   <artifactId>osmpbf</artifactId>
   <packaging>jar</packaging>
-  <version>1.4.0</version>
+  <version>1.5.0</version>
   <name>OSM-Binary</name>
   <description>Library for the OpenStreetMap PBF format</description>
   <url>https://github.com/openstreetmap/OSM-binary</url>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e58623c..846cec1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,6 +8,8 @@ add_library(osmpbf_shared SHARED ${CPPS})
 target_link_libraries(osmpbf_shared PRIVATE protobuf::libprotobuf)
 target_include_directories(osmpbf_shared SYSTEM PUBLIC ${Protobuf_INCLUDE_DIRS})
 set_target_properties(osmpbf_shared PROPERTIES OUTPUT_NAME osmpbf)
+set_target_properties(osmpbf_shared PROPERTIES VERSION ${PROJECT_VERSION})
+set_target_properties(osmpbf_shared PROPERTIES SOVERSION ${PROJECT_VERSION_MAJOR})
 install(TARGETS osmpbf_shared LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
 install(FILES ${CMAKE_SOURCE_DIR}/include/osmpbf/osmpbf.h
diff --git a/src/Makefile b/src/Makefile
index 67c745a..1fdac7b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -7,7 +7,7 @@ CXXFLAGS ?= -O3
 AR       ?= ar
 PROTOC   ?= protoc
 SONAME   ?= libosmpbf.so.1
-VERSION  ?= 1.3.3
+VERSION  ?= 1.5.0
 
 CXXFLAGS += -Wall -Wextra -pedantic -Wredundant-decls -Wdisabled-optimization -Wctor-dtor-privacy -Wnon-virtual-dtor -Woverloaded-virtual -Wsign-promo -Wno-long-long