Skip to content

Commit 45f92a9

Browse files
committed
Set project version with CMake project() command
1 parent 0a3b50c commit 45f92a9

File tree

3 files changed

+8
-23
lines changed

3 files changed

+8
-23
lines changed

CMakeLists.txt

+5-20
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,12 @@
77
#-----------------------------------------------------------------------------
88

99
cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
10-
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
11-
12-
13-
#-----------------------------------------------------------------------------
14-
#
15-
# Project version
16-
#
17-
#-----------------------------------------------------------------------------
1810

19-
project(osmcoastline)
11+
project(osmcoastline VERSION 2.4.0 LANGUAGES CXX C)
2012

21-
set(OSMCOASTLINE_VERSION_MAJOR 2)
22-
set(OSMCOASTLINE_VERSION_MINOR 4)
23-
set(OSMCOASTLINE_VERSION_PATCH 0)
13+
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
2414

25-
set(OSMCOASTLINE_VERSION
26-
${OSMCOASTLINE_VERSION_MAJOR}.${OSMCOASTLINE_VERSION_MINOR}.${OSMCOASTLINE_VERSION_PATCH})
15+
#-----------------------------------------------------------------------------
2716

2817
set(AUTHOR "Jochen Topf <[email protected]>")
2918

@@ -256,8 +245,8 @@ if(PANDOC)
256245
-s
257246
-t man
258247
--template ${CMAKE_CURRENT_SOURCE_DIR}/man/manpage.template
259-
--variable "description=osmcoastline/${OSMCOASTLINE_VERSION}"
260-
--variable "version=${OSMCOASTLINE_VERSION}"
248+
--variable "description=osmcoastline/${PROJECT_VERSION}"
249+
--variable "version=${PROJECT_VERSION}"
261250
--variable "author=${AUTHOR}"
262251
)
263252
set(PANDOC_HTML_OPTIONS -s -t html)
@@ -358,10 +347,6 @@ add_subdirectory(test)
358347
#
359348
#-----------------------------------------------------------------------------
360349

361-
set(CPACK_PACKAGE_VERSION_MAJOR ${OSMCOASTLINE_VERSION_MAJOR})
362-
set(CPACK_PACKAGE_VERSION_MINOR ${OSMCOASTLINE_VERSION_MINOR})
363-
set(CPACK_PACKAGE_VERSION_PATCH ${OSMCOASTLINE_VERSION_PATCH})
364-
365350
if(WIN32)
366351
set(CPACK_GENERATOR ZIP)
367352
else()

osmcoastline_readmeta

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
set -euo pipefail
77

8-
OSMCOASTLINE_VERSION=@OSMCOASTLINE_VERSION@
8+
OSMCOASTLINE_VERSION=@PROJECT_VERSION@
99

1010
SQLEXEC="sqlite3"
1111

src/version.cpp.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
#include <osmium/version.hpp>
33

44
const char* get_osmcoastline_version() noexcept {
5-
return "@OSMCOASTLINE_VERSION@";
5+
return "@PROJECT_VERSION@";
66
}
77

88
const char* get_osmcoastline_long_version() noexcept {
9-
return "version @OSMCOASTLINE_VERSION@@VERSION_FROM_GIT@";
9+
return "version @PROJECT_VERSION@@VERSION_FROM_GIT@";
1010
}
1111

1212
const char* get_libosmium_version() noexcept {

0 commit comments

Comments
 (0)