Merge topic 'version-tarball-in-git'

c6d23cad Fix VTK-m version for tarball in another git repository

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !974
This commit is contained in:
Kenneth Moreland 2017-10-19 20:37:34 +00:00 committed by Kitware Robot
commit 31a518beac

@ -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}