Merge topic 'cmake_refactor_correct_pyexpander_and_install_issues'
c6dcbc1f Check for git version only once f2f8796d Properly install all required cmake files needed by vtk-m b658a72a Fix broken VTK-m PyExpander functin Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1144
This commit is contained in:
commit
0059351eb1
@ -38,7 +38,7 @@ function(vtkm_get_kit_name kitvar)
|
||||
endfunction(vtkm_get_kit_name)
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
function(vtkm_pyexpander_generated_file)
|
||||
function(vtkm_pyexpander_generated_file generated_file_name)
|
||||
# If pyexpander is available, add targets to build and check
|
||||
if(PYEXPANDER_FOUND AND PYTHONINTERP_FOUND)
|
||||
add_custom_command(
|
||||
|
@ -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.
|
||||
@ -265,11 +255,12 @@ if(NOT VTKm_INSTALL_ONLY_LIBRARIES)
|
||||
# Install support files.
|
||||
install(
|
||||
FILES
|
||||
${VTKm_SOURCE_DIR}/CMake/VTKmWrappers.cmake
|
||||
${VTKm_SOURCE_DIR}/CMake/VTKmCPUVectorization.cmake
|
||||
${VTKm_SOURCE_DIR}/CMake/VTKmDetectCUDAVersion.cu
|
||||
${VTKm_SOURCE_DIR}/CMake/VTKmDeviceAdapters.cmake
|
||||
${VTKm_SOURCE_DIR}/CMake/VTKmRenderingContexts.cmake
|
||||
${VTKm_SOURCE_DIR}/CMake/VTKmExportHeaderTemplate.h.in
|
||||
${VTKm_SOURCE_DIR}/CMake/VTKmRenderingContexts.cmake
|
||||
${VTKm_SOURCE_DIR}/CMake/VTKmWrappers.cmake
|
||||
DESTINATION ${VTKm_INSTALL_CMAKE_MODULE_DIR}
|
||||
)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user