[SWDEV-493519] Fix Getting Version Information (#201)
Signed-off-by: Joseph Narlo <joseph.narlo@amd.com>
This commit is contained in:
@@ -64,11 +64,14 @@ function(get_version_from_tag DEFAULT_VERSION_STRING VERSION_PREFIX GIT)
|
||||
parse_version ( ${DEFAULT_VERSION_STRING} )
|
||||
|
||||
if ( GIT )
|
||||
execute_process ( COMMAND git describe --tags --dirty --long --match ${VERSION_PREFIX}-[0-9.]*
|
||||
execute_process ( COMMAND git tag --list --sort=-version:refname "${VERSION_PREFIX}*" | head -n 1 ${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 ()
|
||||
|
||||
@@ -43,6 +43,7 @@
|
||||
#include <functional>
|
||||
|
||||
#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"
|
||||
@@ -3237,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 = AMDSMI_LIB_VERSION_MAJOR;
|
||||
version->minor = AMDSMI_LIB_VERSION_MINOR;
|
||||
version->release = AMDSMI_LIB_VERSION_RELEASE;
|
||||
version->build = AMDSMI_LIB_VERSION_STRING;
|
||||
version->major = amd_smi_VERSION_MAJOR;
|
||||
version->minor = amd_smi_VERSION_MINOR;
|
||||
version->release = amd_smi_VERSION_PATCH;
|
||||
version->build = amd_smi_VERSION_BUILD;
|
||||
|
||||
return AMDSMI_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user