From 6db006a28b904cb8909a5f5fbc94d5f04748f402 Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Wed, 30 Nov 2016 14:10:30 -0500 Subject: [PATCH] VTK-m cmake config files not explicitly state we require cmake 3.3 --- CMake/VTKmConfig.cmake.in | 3 +++ CMake/VTKmConfigureComponents.cmake | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CMake/VTKmConfig.cmake.in b/CMake/VTKmConfig.cmake.in index 47f12a7c7..ef9f72d74 100755 --- a/CMake/VTKmConfig.cmake.in +++ b/CMake/VTKmConfig.cmake.in @@ -33,8 +33,11 @@ # @VTKm_AVAILABLE_COMPONENTS_LIST@ # +cmake_minimum_required(VERSION 3.3 FATAL_ERROR) + @PACKAGE_INIT@ + # The VTKm version number set(VTKm_MAJOR_VERSION "@VTKm_MAJOR_VERSION@") set(VTKm_MINOR_VERSION "@VTKm_MINOR_VERSION@") diff --git a/CMake/VTKmConfigureComponents.cmake b/CMake/VTKmConfigureComponents.cmake index 1d7bab54e..b927bf9f2 100644 --- a/CMake/VTKmConfigureComponents.cmake +++ b/CMake/VTKmConfigureComponents.cmake @@ -351,7 +351,6 @@ macro(vtkm_configure_component_CUDA) #find the position of the "--generate-code" output. With some compilers such as #msvc we get compile output plus run output. So we need to strip out just the #run output - message(STATUS "run_output: ${run_output}") string(FIND "${run_output}" "--generate-code" position) string(SUBSTRING "${run_output}" ${position} -1 run_output)