commit 92c61028d3ff1293d9786fae24da275529c82018
author Logan Smith <logan.r.smith0@gmail.com> Wed Jul 22 17:44:52 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Tue Sep 01 01:06:02 2020 -0700
tree 2cbb046695310f5b6866013256c8440b171e9ea2
parent dda4a456bf3e556f27a2c6295533ab7e401464e7

Reapply "Try enabling -Wsuggest-override again, using add_compile_options instead of add_compile_definitions for disabling it in unittests/ directories."

add_compile_options is more sensitive to its location in the file than add_definitions--it only takes effect for sources that are added after it. This updated patch ensures that the add_compile_options is done before adding any source files that depend on it.

Using add_definitions caused the flag to be passed to rc.exe on Windows and thus broke Windows builds.

GitOrigin-RevId: 77e0e9e17daf0865620abcd41f692ab0642367c4

acxxel/CMakeLists.txt

diff --git a/acxxel/CMakeLists.txt b/acxxel/CMakeLists.txt
index 7e71446..6391c73 100644
--- a/acxxel/CMakeLists.txt
+++ b/acxxel/CMakeLists.txt
@@ -36,6 +36,9 @@
 
 # Add warning flags.
 set(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -Wall -Wextra")
+if (CXX_SUPPORTS_SUGGEST_OVERRIDE_FLAG)
+    add_compile_options("-Wno-suggest-override")
+endif()
 
 add_library(
     acxxel