Fix cathook info plate not displaying commit date

This commit is contained in:
LightCat 2019-04-21 23:23:27 +02:00
parent e266af8ad3
commit 2c422a3f1a
3 changed files with 4 additions and 4 deletions

View File

@ -69,7 +69,7 @@ execute_process(COMMAND
execute_process(COMMAND execute_process(COMMAND
"${GIT_EXECUTABLE}" log -1 --pretty=\"%ai\" "${GIT_EXECUTABLE}" log -1 --pretty=\"%ai\"
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
OUTPUT_VARIABLE GIT_COMMIT_TIME OUTPUT_VARIABLE GIT_COMMITTER_DATE
ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
find_library(ValveLibrarySDL2 NAMES libSDL2-2.0.so.0 PATHS "${PROJECT_SOURCE_DIR}/lib" NO_DEFAULT_PATH) find_library(ValveLibrarySDL2 NAMES libSDL2-2.0.so.0 PATHS "${PROJECT_SOURCE_DIR}/lib" NO_DEFAULT_PATH)

View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#define GIT_COMMIT_HASH @GIT_COMMIT_HASH@ #define GIT_COMMIT_HASH @GIT_COMMIT_HASH@
#define GIT_COMMIT_DATE @GIT_COMMIT_DATE@ #define GIT_COMMITTER_DATE @GIT_COMMITTER_DATE@

View File

@ -43,8 +43,8 @@ const std::string &hack::GetVersion()
static bool version_set = false; static bool version_set = false;
if (version_set) if (version_set)
return version; return version;
#if defined(GIT_COMMIT_HASH) && defined(GIT_COMMIT_DATE) #if defined(GIT_COMMIT_HASH) && defined(GIT_COMMITTER_DATE)
version = "Version: #" GIT_COMMIT_HASH " " GIT_COMMIT_DATE; version = "Version: #" GIT_COMMIT_HASH " " GIT_COMMITTER_DATE;
#endif #endif
version_set = true; version_set = true;
return version; return version;