From 2c422a3f1ac051582914958af68b78726b0bca4f Mon Sep 17 00:00:00 2001 From: LightCat Date: Sun, 21 Apr 2019 23:23:27 +0200 Subject: [PATCH] Fix cathook info plate not displaying commit date --- CMakeLists.txt | 2 +- include/version.h.in | 2 +- src/hack.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 01f4ea4f..1605c569 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -69,7 +69,7 @@ execute_process(COMMAND execute_process(COMMAND "${GIT_EXECUTABLE}" log -1 --pretty=\"%ai\" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" - OUTPUT_VARIABLE GIT_COMMIT_TIME + OUTPUT_VARIABLE GIT_COMMITTER_DATE ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) find_library(ValveLibrarySDL2 NAMES libSDL2-2.0.so.0 PATHS "${PROJECT_SOURCE_DIR}/lib" NO_DEFAULT_PATH) diff --git a/include/version.h.in b/include/version.h.in index e4f26097..37994149 100755 --- a/include/version.h.in +++ b/include/version.h.in @@ -1,4 +1,4 @@ #pragma once #define GIT_COMMIT_HASH @GIT_COMMIT_HASH@ -#define GIT_COMMIT_DATE @GIT_COMMIT_DATE@ \ No newline at end of file +#define GIT_COMMITTER_DATE @GIT_COMMITTER_DATE@ \ No newline at end of file diff --git a/src/hack.cpp b/src/hack.cpp index a45984be..f293670b 100644 --- a/src/hack.cpp +++ b/src/hack.cpp @@ -43,8 +43,8 @@ const std::string &hack::GetVersion() static bool version_set = false; if (version_set) return version; -#if defined(GIT_COMMIT_HASH) && defined(GIT_COMMIT_DATE) - version = "Version: #" GIT_COMMIT_HASH " " GIT_COMMIT_DATE; +#if defined(GIT_COMMIT_HASH) && defined(GIT_COMMITTER_DATE) + version = "Version: #" GIT_COMMIT_HASH " " GIT_COMMITTER_DATE; #endif version_set = true; return version;