mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-10-05 01:49:02 +00:00
Merge topic 'fix-xl-warnings'
e3d734708 IBM XL: disable unused-template pragma for xl Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robert.maynard@kitware.com> Merge-request: !2230
This commit is contained in:
commit
42009394fc
@ -22,6 +22,8 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
|
||||
set(VTKM_COMPILER_IS_CLANG 1)
|
||||
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
|
||||
set(VTKM_COMPILER_IS_GNU 1)
|
||||
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "XLClang")
|
||||
set(VTKM_COMPILER_IS_XL 1)
|
||||
endif()
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
@ -51,7 +53,7 @@ if(VTKM_COMPILER_IS_MSVC)
|
||||
if(TARGET vtkm::cuda)
|
||||
target_compile_options(vtkm_compiler_flags INTERFACE $<$<COMPILE_LANGUAGE:CUDA>:-Xcompiler="/Gy">)
|
||||
endif()
|
||||
elseif(NOT VTKM_COMPILER_IS_PGI) #can't find an equivalant PGI flag
|
||||
elseif(NOT (VTKM_COMPILER_IS_PGI OR VTKM_COMPILER_IS_XL)) #can't find an equivalant PGI/XL flag
|
||||
target_compile_options(vtkm_compiler_flags INTERFACE $<$<COMPILE_LANGUAGE:CXX>:-ffunction-sections>)
|
||||
if(TARGET vtkm::cuda)
|
||||
target_compile_options(vtkm_compiler_flags INTERFACE $<$<COMPILE_LANGUAGE:CUDA>:-Xcompiler=-ffunction-sections>)
|
||||
|
@ -122,6 +122,10 @@
|
||||
_Pragma("GCC diagnostic ignored \"-Wnon-virtual-dtor\"") \
|
||||
_Pragma("GCC diagnostic ignored \"-Wdeprecated\"")
|
||||
_Pragma("GCC diagnostic ignored \"-Wunused-template\"")
|
||||
#elif defined(VTKM_CLANG) && defined(__ibmxl__)
|
||||
#define VTK_M_THIRDPARTY_CLANG_WARNING_PRAGMAS \
|
||||
_Pragma("GCC diagnostic ignored \"-Wnon-virtual-dtor\"") \
|
||||
_Pragma("GCC diagnostic ignored \"-Wdeprecated\"")
|
||||
#elif defined(VTKM_CLANG)
|
||||
#define VTK_M_THIRDPARTY_CLANG_WARNING_PRAGMAS \
|
||||
_Pragma("GCC diagnostic ignored \"-Wnon-virtual-dtor\"") \
|
||||
|
Loading…
Reference in New Issue
Block a user