Skip to content

Commit ad2a404

Browse files
[libvtrutil][CMake] Updated Deprecated exec_program
There were some CMake warnings during compile-time which were complaining about exec_program being deprecated. Replaced with execute_process which is a more verbose command to use anyways.
1 parent a3a6ee5 commit ad2a404

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

libs/libvtrutil/cmake/modules/configure_version.cmake

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44
#Figure out the git revision
55
find_package(Git QUIET)
66
if(GIT_FOUND)
7-
exec_program(${GIT_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}
8-
ARGS describe --always --long --dirty
9-
OUTPUT_VARIABLE VTR_VCS_REVISION
10-
RETURN_VALUE GIT_DESCRIBE_RETURN_VALUE)
7+
execute_process(COMMAND ${GIT_EXECUTABLE} describe --always --long --dirty
8+
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
9+
OUTPUT_VARIABLE VTR_VCS_REVISION
10+
OUTPUT_STRIP_TRAILING_WHITESPACE
11+
RESULT_VARIABLE GIT_DESCRIBE_RETURN_VALUE)
1112

1213
if(NOT GIT_DESCRIBE_RETURN_VALUE EQUAL 0)
1314
#Git describe failed, usually this means we
@@ -18,10 +19,12 @@ if(GIT_FOUND)
1819

1920
#Call again with exclude to get the revision excluding any tags
2021
#(i.e. just the commit ID and dirty flag)
21-
exec_program(${GIT_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}
22-
ARGS describe --always --long --dirty --exclude '*'
23-
OUTPUT_VARIABLE VTR_VCS_REVISION_SHORT
24-
RETURN_VALUE GIT_DESCRIBE_RETURN_VALUE)
22+
execute_process(COMMAND ${GIT_EXECUTABLE} describe --always --long --dirty --exclude '*'
23+
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
24+
OUTPUT_VARIABLE VTR_VCS_REVISION_SHORT
25+
OUTPUT_STRIP_TRAILING_WHITESPACE
26+
RESULT_VARIABLE GIT_DESCRIBE_RETURN_VALUE)
27+
2528
if(NOT GIT_DESCRIBE_RETURN_VALUE EQUAL 0)
2629
#Git describe failed, usually this means we
2730
#aren't in a git repo -- so don't set a VCS

0 commit comments

Comments
 (0)