gerrit.automotivelinux Code Review - AGL/meta-agl-devel.git/blob

   1 Enable building with g++ 9.x
   2
   3 Disable -Werror for new warning "deprecated-copy" to avoid build
   4 failure in the packaged copy of googletest with g++ 9.x.  This is
   5 hopefully temporary until googletest is upgraded or it becomes
   6 straightforward to build against an externally provided copy.
   7
   8 Upstream-Status: pending
   9
  10 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
  11
  12 diff --git a/ThirdParty/googletest-release-1.8.0/googletest/cmake/internal_utils.cmake b/ThirdParty/googletest-release-1.8.0/googletest/cmake/internal_utils.cmake
  13 index 777b91e..7832f20 100644
  14 --- a/ThirdParty/googletest-release-1.8.0/googletest/cmake/internal_utils.cmake
  15 +++ b/ThirdParty/googletest-release-1.8.0/googletest/cmake/internal_utils.cmake
  16 @@ -91,7 +91,7 @@ macro(config_compiler_and_linker)
  17      set(cxx_no_exception_flags "-D_HAS_EXCEPTIONS=0")
  18      set(cxx_no_rtti_flags "-GR-")
  19    elseif (CMAKE_COMPILER_IS_GNUCXX)
  20 -    set(cxx_base_flags "-Wall -Wshadow")
  21 +    set(cxx_base_flags "-Wall -Wshadow -Wno-error=deprecated-copy")
  22      set(cxx_exception_flags "-fexceptions")
  23      set(cxx_no_exception_flags "-fno-exceptions")
  24      # Until version 4.3.2, GCC doesn't define a macro to indicate