From 03b5f184b4bd65e3b26af06a9dd354190287db67 Mon Sep 17 00:00:00 2001 From: Kai Blaschke Date: Wed, 20 Sep 2023 10:04:57 +0200 Subject: [PATCH] Use PROJECT_VERSION instead of CMAKE_PROJECT_VERSION. Otherwise, this would use the topmost project's version specifier, which might not be set to anything useful and would prevent determining the projectM version properly. --- CMakeLists.txt | 2 +- src/api/version.h.in | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7e2a14358c..f613795f00 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,7 +34,7 @@ project(libprojectM set(PROJECTM_SO_VERSION "4") # The actual (full) library version of projectM -set(PROJECTM_LIB_VERSION "${CMAKE_PROJECT_VERSION}") +set(PROJECTM_LIB_VERSION "${PROJECT_VERSION}") list(APPEND CMAKE_MODULE_PATH "${PROJECTM_SOURCE_DIR}/cmake") diff --git a/src/api/version.h.in b/src/api/version.h.in index 3f936b19d2..57f1cabf6b 100644 --- a/src/api/version.h.in +++ b/src/api/version.h.in @@ -1,11 +1,11 @@ #pragma once -#define PROJECTM_VERSION_MAJOR @CMAKE_PROJECT_VERSION_MAJOR@ -#define PROJECTM_VERSION_MINOR @CMAKE_PROJECT_VERSION_MINOR@ -#define PROJECTM_VERSION_PATCH @CMAKE_PROJECT_VERSION_PATCH@ +#define PROJECTM_VERSION_MAJOR @PROJECT_VERSION_MAJOR@ +#define PROJECTM_VERSION_MINOR @PROJECT_VERSION_MINOR@ +#define PROJECTM_VERSION_PATCH @PROJECT_VERSION_PATCH@ /* Full version number as a string literal */ -#define PROJECTM_VERSION_STRING "@CMAKE_PROJECT_VERSION@" +#define PROJECTM_VERSION_STRING "@PROJECT_VERSION@" /* VCS version number, e.g. Git commit hash */ #define PROJECTM_VERSION_VCS "@PROJECTM_VCS_VERSION@"