Commit 3e4778b0 authored by Allison Vacanti's avatar Allison Vacanti Committed by Kitware Robot

Merge topic 'paraview_fixes'

e9633e1d Move some MSVC warning disablers to Configure.h
7fd7336a Don't version include directory under build tree.
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard's avatarRobert Maynard <robert.maynard@kitware.com>
Merge-request: !975
parents b5b56cd8 e9633e1d
......@@ -84,11 +84,7 @@ function(vtkm_setup_msvc_properties target )
# unreachable code
#C4505 Generates numerous warnings about unused functions being
# removed when doing header test builds.
#C4512 Generates numerous warning that implicit assignment operators can't
# be constructed. This is understood and we don't care.
#C4510 Generates numerous warning that implicit constructors can't
# be constructed. This is understood and we don't care.
target_compile_options(${target} PRIVATE -wd4702 -wd4505 -wd4512 -wd4510)
target_compile_options(${target} PRIVATE -wd4702 -wd4505)
# In VS2013 the C4127 warning has a bug in the implementation and
# generates false positive warnings for lots of template code
......
......@@ -57,7 +57,7 @@ if (NOT DEFINED VTKm_INSTALL_CMAKE_MODULE_DIR)
set(VTKm_INSTALL_CMAKE_MODULE_DIR "share/vtkm-${VTKm_VERSION_MAJOR}.${VTKm_VERSION_MINOR}/cmake")
endif()
set(VTKm_BINARY_INCLUDE_DIR "${VTKm_BINARY_DIR}/include/vtkm-${VTKm_VERSION_MAJOR}.${VTKm_VERSION_MINOR}")
set(VTKm_BINARY_INCLUDE_DIR "${VTKm_BINARY_DIR}/include")
set(VTKm_EXPORT_NAME "VTKmTargets")
......@@ -78,8 +78,8 @@ add_library(vtkm INTERFACE)
target_compile_features(vtkm INTERFACE cxx_auto_type)
target_include_directories(vtkm INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include/vtkm-${VTKm_VERSION_MAJOR}.${VTKm_VERSION_MINOR}>
$<INSTALL_INTERFACE:include>
$<BUILD_INTERFACE:${VTKm_BINARY_INCLUDE_DIR}>
$<INSTALL_INTERFACE:${VTKm_INSTALL_INCLUDE_DIR}>
)
install(TARGETS vtkm EXPORT ${VTKm_EXPORT_NAME})
......
......@@ -332,6 +332,17 @@
//
#pragma warning(disable:4251)
// MSVC 2013 and earlier only:
#if _MSC_VER <= 1800
// Generates numerous warnings that implicit constructors can't
// be constructed. This is understood and we don't care.
#pragma warning(disable:4510)
// Generates numerous warnings that implicit assignment operators can't
// be constructed. This is understood and we don't care.
#pragma warning(disable:4512)
#endif // MSVC <= 2013
#endif
#endif //vtkm_internal_Configure_h
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