diff options
| author | Luke Berndt <lukekb@gmail.com> | 2022-12-22 21:58:50 -0500 |
|---|---|---|
| committer | Luke Berndt <lukekb@gmail.com> | 2022-12-22 21:58:50 -0500 |
| commit | 3f036e0c6f69bd883a54a8cb96f07257602a07c2 (patch) | |
| tree | d28160cd79b2b6bb9d35509b07ec3d971c9bd412 | |
| parent | 42f3030da451478293e5b4363710c4e6c6666d66 (diff) | |
Fixing up the versioning
| -rw-r--r-- | CMakeLists.txt | 15 | ||||
| -rw-r--r-- | cmake.h | 10 | ||||
| -rw-r--r-- | cmake.h.in | 5 |
3 files changed, 8 insertions, 22 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c33b0aaf..d1de4afe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,11 +22,11 @@ ######################################################################## cmake_minimum_required(VERSION 3.2) -project(Trunk-Recorder LANGUAGES CXX C VERSION "4.4.2") +project(Trunk-Recorder LANGUAGES CXX C VERSION "4.5.0") -configure_file(cmake.h.in "${PROJECT_SOURCE_DIR}/cmake.h" @ONLY) +configure_file(cmake.h.in "${PROJECT_BINARY_DIR}/cmake.h" @ONLY) ADD_COMPILE_DEFINITIONS(MANUAL_GITINFO="${MANUAL_GITINFO}") - +include_directories("${PROJECT_BINARY_DIR}") # Define the two required variables before including # the source code for watching a git repository. @@ -46,18 +46,9 @@ if(NOT CMAKE_BUILD_TYPE) endif(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "") - # Make sure our local CMake Modules path comes first list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake/Modules) -# Set the version information here -set(VERSION_MAJOR 4) -set(VERSION_API 5) -set(VERSION_ABI 0) -set(VERSION_PATCH git) - - - ######################################################################## # Compiler specific setup ######################################################################## diff --git a/cmake.h b/cmake.h deleted file mode 100644 index 909b5d5a..00000000 --- a/cmake.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef INCLUDE_GUARD -#define INCLUDE_GUARD - -#define PROJECT_NAME "Trunk-Recorder" -#define PROJECT_VER "4.5.0" -#define PROJECT_VER_MAJOR "4" -#define PROJECT_VER_MINOR "5" -#define PTOJECT_VER_PATCH "0" - -#endif // INCLUDE_GUARD @@ -1,3 +1,8 @@ +// +// DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED!!!! +// edit cmake.h.in instead +// + #ifndef INCLUDE_GUARD #define INCLUDE_GUARD |