|
7 | 7 | #-----------------------------------------------------------------------------
|
8 | 8 |
|
9 | 9 | 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 |
| -#----------------------------------------------------------------------------- |
18 | 10 |
|
19 |
| -project(osmcoastline) |
| 11 | +project(osmcoastline VERSION 2.4.0 LANGUAGES CXX C) |
20 | 12 |
|
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") |
24 | 14 |
|
25 |
| -set(OSMCOASTLINE_VERSION |
26 |
| - ${OSMCOASTLINE_VERSION_MAJOR}.${OSMCOASTLINE_VERSION_MINOR}.${OSMCOASTLINE_VERSION_PATCH}) |
| 15 | +#----------------------------------------------------------------------------- |
27 | 16 |
|
28 | 17 | set(AUTHOR "Jochen Topf <[email protected]>")
|
29 | 18 |
|
@@ -256,8 +245,8 @@ if(PANDOC)
|
256 | 245 | -s
|
257 | 246 | -t man
|
258 | 247 | --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}" |
261 | 250 | --variable "author=${AUTHOR}"
|
262 | 251 | )
|
263 | 252 | set(PANDOC_HTML_OPTIONS -s -t html)
|
@@ -358,10 +347,6 @@ add_subdirectory(test)
|
358 | 347 | #
|
359 | 348 | #-----------------------------------------------------------------------------
|
360 | 349 |
|
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 |
| - |
365 | 350 | if(WIN32)
|
366 | 351 | set(CPACK_GENERATOR ZIP)
|
367 | 352 | else()
|
|
0 commit comments