From 9e6b0b03eab3803a3c627f96828330b01bbb4528 Mon Sep 17 00:00:00 2001 From: Linus Dierheimer Date: Sat, 13 Nov 2021 18:43:33 +0100 Subject: [PATCH] Tell vulkan the right project version --- CMakeLists.txt | 1 + src/fastfetch_config.h.in | 1 + src/modules/gpu.c | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1776e1b44..e9889aebb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,6 +29,7 @@ execute_process( ) set(PROJECT_VERSION "r${GIT_REV_LIST}.${GIT_REV_PARSE}") +set(PROJECT_VERSION_MAJOR "${GIT_REV_LIST}") function(fastfetch_load_text FILENAME OUTVAR) file(READ "${FILENAME}" TEMP) diff --git a/src/fastfetch_config.h.in b/src/fastfetch_config.h.in index 657f14a8d..bece0832e 100644 --- a/src/fastfetch_config.h.in +++ b/src/fastfetch_config.h.in @@ -3,6 +3,7 @@ #define FASTFETCH_PROJECT_NAME "@PROJECT_NAME@" #define FASTFETCH_PROJECT_VERSION "@PROJECT_VERSION@" +#define FASTFETCH_PROJECT_VERSION_MAJOR @PROJECT_VERSION_MAJOR@ #define FASTFETCH_DATATEXT_STRUCTURE "@DATATEXT_STRUCTURE@" #define FASTFETCH_DATATEXT_CONFIG "@DATATEXT_CONFIG@" //Requires FASTFETCH_PROJECT_VERSION and FASTFETCH_DATATEXT_STRUCTURE to be set diff --git a/src/modules/gpu.c b/src/modules/gpu.c index c136df956..8d066285e 100644 --- a/src/modules/gpu.c +++ b/src/modules/gpu.c @@ -26,9 +26,9 @@ static void vulkanFillGPUs(FFinstance* instance, FFlist* results) .sType = VK_STRUCTURE_TYPE_APPLICATION_INFO, .pNext = NULL, .pApplicationName = FASTFETCH_PROJECT_NAME, - .applicationVersion = VK_MAKE_VERSION(FASTFETCH_PROJECT_NAME, 0, 0), + .applicationVersion = VK_MAKE_VERSION(FASTFETCH_PROJECT_VERSION_MAJOR, 0, 0), .pEngineName = "vulkanPrintGPUs", - .engineVersion = VK_MAKE_VERSION(FASTFETCH_PROJECT_NAME, 0, 0), + .engineVersion = VK_MAKE_VERSION(FASTFETCH_PROJECT_VERSION_MAJOR, 0, 0), .apiVersion = VK_API_VERSION_1_0, };