Commit c6d23cad authored by Kenneth Moreland's avatar Kenneth Moreland

Fix VTK-m version for tarball in another git repository

A ParaView user noted that the determine version script (which is
essentially the same for ParaView and VTK-m) incorrectly used the
results of git describe when the source actually came from a tarball
distribution that was placed in another git archive. (The SHA was
incorrectly taken from the enclosing git project.) See the ParaView bug
for more details on the report:

paraview/paraview#17761

This fix simply checks to make sure the the source directory has the
.git subdirectory expected in all git projects.
parent 546b2144
......@@ -42,7 +42,7 @@ function(determine_version source_dir git_command var_prefix)
# this function.
return ()
elseif (NOT VTKm_GIT_DESCRIBE)
if(EXISTS ${git_command})
if(EXISTS ${git_command} AND EXISTS ${source_dir}/.git)
execute_process(
COMMAND ${git_command} describe
WORKING_DIRECTORY ${source_dir}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment