]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Merge pull request #14783 from masterleinad/disable_warnings_nvcc
authorWolfgang Bangerth <bangerth@colostate.edu>
Tue, 21 Feb 2023 19:00:38 +0000 (12:00 -0700)
committerGitHub <noreply@github.com>
Tue, 21 Feb 2023 19:00:38 +0000 (12:00 -0700)
Suppress some nvcc warnings

1  2 
cmake/macros/macro_deal_ii_add_library.cmake
cmake/macros/macro_insource_setup_target.cmake
source/base/data_out_base.cc

index e765cb5e6756c4766ee6b299232e8fbeff287c00,4131de49d01285b23d2b3b1a8f706c2f3d2e6407..8a956bc2e4ee12d3c73a91050fc5750c7fce1447
@@@ -36,13 -36,17 +36,18 @@@ function(insource_setup_target _target 
      PRIVATE
        "${CMAKE_BINARY_DIR}/include"
        "${CMAKE_SOURCE_DIR}/include"
 -      ${DEAL_II_BUNDLED_INCLUDE_DIRS}
      )
 -  target_include_directories(${_target} SYSTEM PRIVATE ${DEAL_II_INCLUDE_DIRS})
 +  target_include_directories(${_target}
 +    SYSTEM PRIVATE ${DEAL_II_INCLUDE_DIRS} ${DEAL_II_BUNDLED_INCLUDE_DIRS}
 +    )
  
    set(_flags "${DEAL_II_CXX_FLAGS} ${DEAL_II_CXX_FLAGS_${_build}}")
-   separate_arguments(_flags)
+   # Make sure some CUDA warning flags don't get deduplicated
+   string(REGEX REPLACE "(-Xcudafe --diag_suppress=[^ ]+)" "\"SHELL:\\1\"" _flags ${_flags})
+   separate_arguments(_flags UNIX_COMMAND ${_flags})
    target_compile_options(${_target} PUBLIC ${_flags})
  
    target_compile_definitions(${_target}
Simple merge

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.