From 7ff8041afa609082e2703b035c008fa401ea403d Mon Sep 17 00:00:00 2001 From: "Arif, Maisam" Date: Fri, 28 Mar 2025 21:35:54 -0500 Subject: [PATCH] Revert "[SWDEV-493519] Fix Getting Version Information (#201)" This reverts commit df8ee3db85bc0b3930aec9b95275040c8bda498c. --- cmake_modules/utils.cmake | 5 +---- src/amd_smi/amd_smi.cc | 9 ++++----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/cmake_modules/utils.cmake b/cmake_modules/utils.cmake index bb6945c346..d76ad45480 100644 --- a/cmake_modules/utils.cmake +++ b/cmake_modules/utils.cmake @@ -64,14 +64,11 @@ function(get_version_from_tag DEFAULT_VERSION_STRING VERSION_PREFIX GIT) parse_version ( ${DEFAULT_VERSION_STRING} ) if ( GIT ) - execute_process ( COMMAND git tag --list --sort=-version:refname "${VERSION_PREFIX}*" | head -n 1 ${VERSION_PREFIX}-[0-9.]* + execute_process ( COMMAND git describe --tags --dirty --long --match ${VERSION_PREFIX}-[0-9.]* WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE GIT_TAG_STRING OUTPUT_STRIP_TRAILING_WHITESPACE RESULT_VARIABLE RESULT ) - if ( GIT_TAG_STRING STREQUAL "" ) - set ( RESULT "1" ) - endif() if ( ${RESULT} EQUAL 0 ) parse_version ( ${GIT_TAG_STRING} ) endif () diff --git a/src/amd_smi/amd_smi.cc b/src/amd_smi/amd_smi.cc index c8896f80c9..0f4fba4a22 100644 --- a/src/amd_smi/amd_smi.cc +++ b/src/amd_smi/amd_smi.cc @@ -43,7 +43,6 @@ #include #include "amd_smi/amdsmi.h" -#include "amd_smi/amd_smiConfig.h" #include "amd_smi/impl/fdinfo.h" #include "amd_smi/impl/amd_smi_common.h" #include "amd_smi/impl/amd_smi_system.h" @@ -3239,10 +3238,10 @@ amdsmi_status_t amdsmi_get_lib_version(amdsmi_version_t *version) { return AMDSMI_STATUS_INVAL; version->year = AMDSMI_LIB_VERSION_YEAR; - version->major = amd_smi_VERSION_MAJOR; - version->minor = amd_smi_VERSION_MINOR; - version->release = amd_smi_VERSION_PATCH; - version->build = amd_smi_VERSION_BUILD; + version->major = AMDSMI_LIB_VERSION_MAJOR; + version->minor = AMDSMI_LIB_VERSION_MINOR; + version->release = AMDSMI_LIB_VERSION_RELEASE; + version->build = AMDSMI_LIB_VERSION_STRING; return AMDSMI_STATUS_SUCCESS; }