Check for git version only once
The check to determine the version of VTK-m from git was duplicated in CMakeLists.txt. Although pointless, it generally was not a big deal (only an extra check when running CMake). Except for some reason with the latest changes to the CMake build the second time find_package(Git) was called on my system the GIT_EXECUTABLE variable got cleared out and that caused the configure to fail. I have no idea why this happens (and running CMake again seems to fix the problem), but simply removing the extraneous find seems fix the problem.
This commit is contained in:
parent
f2f8796d1b
commit
c6dcbc1fe1
@ -126,16 +126,6 @@ set(CMAKE_CXX_EXTENSIONS False)
|
||||
# Setup default build types
|
||||
include(VTKmBuildType)
|
||||
|
||||
# Determine VTK-m version
|
||||
include(Utilities/Git/Git.cmake)
|
||||
include(VTKmDetermineVersion)
|
||||
|
||||
# Load hardcoded version in case this is not a Git repository
|
||||
file(STRINGS version.txt version_txt)
|
||||
extract_version_components("${version_txt}" "VTKm")
|
||||
# Get the version from git if we can
|
||||
determine_version(${VTKm_SOURCE_DIR} ${GIT_EXECUTABLE} "VTKm")
|
||||
|
||||
# Create vtkm_compiler_flags library. This is an interface library that
|
||||
# holds all the C++ compiler flags that are needed for consumers and
|
||||
# when building VTK-m.
|
||||
|
Loading…
Reference in New Issue
Block a user