From 52ada599277907204d21d93417ebee4f01b114ea Mon Sep 17 00:00:00 2001 From: Jemale Lockett Date: Thu, 25 Apr 2024 14:58:37 -0400 Subject: [PATCH] Add a log of the ze_loader git sha Signed-off-by: Jemale Lockett --- CMakeLists.txt | 21 +++++++++++++++++++++ source/loader/ze_loader.cpp | 3 ++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5e4af800..ebbe54e8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,6 +57,27 @@ elseif(Git_FOUND) endif() endif() +if(Git_FOUND) + if(MSVC) + execute_process( + COMMAND CMD /c ${GIT_EXECUTABLE} rev-parse HEAD + OUTPUT_VARIABLE VERSION_SHA + OUTPUT_STRIP_TRAILING_WHITESPACE + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + ) + else() + execute_process( + COMMAND ${GIT_EXECUTABLE} rev-parse HEAD + OUTPUT_VARIABLE VERSION_SHA + OUTPUT_STRIP_TRAILING_WHITESPACE + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + ) + endif() +else() + set(VERSION_SHA " - No git SHA found, compiled outside git folder.") +endif() +add_definitions(-DLOADER_VERSION_SHA="${VERSION_SHA}") + include(FetchContent) set(SPDLOG_ROOT "${FETCHCONTENT_BASE_DIR}/spdlog-src") diff --git a/source/loader/ze_loader.cpp b/source/loader/ze_loader.cpp index e2a8846a..f7eff56a 100644 --- a/source/loader/ze_loader.cpp +++ b/source/loader/ze_loader.cpp @@ -281,7 +281,8 @@ namespace loader } if (zel_logger->logging_enabled) - zel_logger->get_base_logger()->info("Loader Version {}.{}.{} ", LOADER_VERSION_MAJOR, LOADER_VERSION_MINOR, LOADER_VERSION_PATCH); + zel_logger->get_base_logger()->info("Loader Version {}.{}.{} {}", LOADER_VERSION_MAJOR, LOADER_VERSION_MINOR, LOADER_VERSION_PATCH, LOADER_VERSION_SHA); + drivers.reserve( discoveredDrivers.size() + getenv_tobool( "ZE_ENABLE_NULL_DRIVER" ) ); if( getenv_tobool( "ZE_ENABLE_NULL_DRIVER" ) )