Skip to content

Commit 39d8885

Browse files
committed
Keep version number in one place
1 parent b56c344 commit 39d8885

3 files changed

Lines changed: 16 additions & 12 deletions

File tree

CMakeLists.txt

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,15 @@ cmake_minimum_required(VERSION 3.5)
22

33
include(ExternalProject)
44

5-
project(Meteordemod LANGUAGES CXX)
5+
project(meteordemod
6+
VERSION 2.6.0
7+
LANGUAGES CXX
8+
)
9+
10+
configure_file(cmake/version.h.in version.h)
11+
12+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DVERSION_BUILD=${VERSION_BUILD_NUMBER}")
13+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DVERSION_BUILD=${VERSION_BUILD_NUMBER}")
614

715
set(CMAKE_CXX_STANDARD 17)
816
set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -104,6 +112,10 @@ include_directories(
104112
${CMAKE_SOURCE_DIR}/external/libcorrect/include
105113
)
106114

115+
target_include_directories(meteordemod PUBLIC
116+
"${PROJECT_BINARY_DIR}"
117+
)
118+
107119
add_dependencies(meteordemod sgp4)
108120
add_dependencies(meteordemod libcorrect)
109121

@@ -136,9 +148,6 @@ if(UNIX AND NOT APPLE)
136148
find_file (DEBIAN_FOUND debian_version debconf.conf PATHS /etc)
137149
if (DEBIAN_FOUND)
138150
SET(CPACK_GENERATOR "DEB")
139-
SET(CPACK_PACKAGE_VERSION_MAJOR "2")
140-
SET(CPACK_PACKAGE_VERSION_MINOR "5")
141-
SET(CPACK_PACKAGE_VERSION_PATCH "7")
142151
SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "Digitelektro")
143152
SET(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/Digitelektro/MeteorDemod")
144153
SET(CPACK_DEBIAN_PACKAGE_DESCRIPTION "Russian Meteor M2 weather satellite data decoder")

cmake/version.h.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#define VERSION_MAJOR @meteordemod_VERSION_MAJOR@
2+
#define VERSION_MINOR @meteordemod_VERSION_MINOR@
3+
#define VERSION_FIX @meteordemod_VERSION_PATCH@

common/version.h

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)