Author: Logan Smith Date: 2020-07-27T08:37:01-07:00 New Revision: a52aea0ba624fcf46602bff8463b7b831e87ba55
URL: https://github.com/llvm/llvm-project/commit/a52aea0ba624fcf46602bff8463b7b831e87ba55 DIFF: https://github.com/llvm/llvm-project/commit/a52aea0ba624fcf46602bff8463b7b831e87ba55.diff LOG: Use INTERFACE_COMPILE_OPTIONS to disable -Wsuggest-override for any target that links to gtest This cleans up several CMakeLists.txt's where -Wno-suggest-override was manually specified. These test targets now inherit this flag from the gtest target. Some unittests CMakeLists.txt's, in particular Flang and LLDB, are not touched by this patch. Flang manually adds the gtest sources itself in some configurations, rather than linking to LLVM's gtest target, so this fix would be insufficient to cover those cases. Similarly, LLDB has subdirectories that manually add the gtest headers to their include path without linking to the gtest target, so those subdirectories still need -Wno-suggest-override to be manually specified to compile without warnings. Differential Revision: https://reviews.llvm.org/D84554 Added: Modified: clang-tools-extra/clangd/unittests/CMakeLists.txt clang-tools-extra/unittests/CMakeLists.txt clang/unittests/CMakeLists.txt lld/unittests/CMakeLists.txt llvm/lib/Testing/Support/CMakeLists.txt llvm/unittests/CMakeLists.txt llvm/utils/unittest/CMakeLists.txt mlir/unittests/CMakeLists.txt polly/unittests/CMakeLists.txt Removed: ################################################################################ diff --git a/clang-tools-extra/clangd/unittests/CMakeLists.txt b/clang-tools-extra/clangd/unittests/CMakeLists.txt index 8ede92c16f7a..c25e2b7f8103 100644 --- a/clang-tools-extra/clangd/unittests/CMakeLists.txt +++ b/clang-tools-extra/clangd/unittests/CMakeLists.txt @@ -13,10 +13,6 @@ include_directories( ${CLANGD_BINARY_DIR} ) -if (CXX_SUPPORTS_SUGGEST_OVERRIDE_FLAG) - add_compile_options("-Wno-suggest-override") -endif() - if(CLANG_BUILT_STANDALONE) # LLVMTestingSupport library is needed for clangd tests. if (EXISTS ${LLVM_MAIN_SRC_DIR}/lib/Testing/Support diff --git a/clang-tools-extra/unittests/CMakeLists.txt b/clang-tools-extra/unittests/CMakeLists.txt index 72abe0fa6d0c..086a68e63830 100644 --- a/clang-tools-extra/unittests/CMakeLists.txt +++ b/clang-tools-extra/unittests/CMakeLists.txt @@ -5,10 +5,6 @@ function(add_extra_unittest test_dirname) add_unittest(ExtraToolsUnitTests ${test_dirname} ${ARGN}) endfunction() -if (CXX_SUPPORTS_SUGGEST_OVERRIDE_FLAG) - add_compile_options("-Wno-suggest-override") -endif() - add_subdirectory(clang-apply-replacements) add_subdirectory(clang-change-namespace) add_subdirectory(clang-doc) diff --git a/clang/unittests/CMakeLists.txt b/clang/unittests/CMakeLists.txt index 9a52b9fb0262..4c222e24599f 100644 --- a/clang/unittests/CMakeLists.txt +++ b/clang/unittests/CMakeLists.txt @@ -1,10 +1,6 @@ add_custom_target(ClangUnitTests) set_target_properties(ClangUnitTests PROPERTIES FOLDER "Clang tests") -if (CXX_SUPPORTS_SUGGEST_OVERRIDE_FLAG) - add_compile_options("-Wno-suggest-override") -endif() - if(CLANG_BUILT_STANDALONE) # LLVMTestingSupport library is needed for some of the unittests. if (EXISTS ${LLVM_MAIN_SRC_DIR}/lib/Testing/Support diff --git a/lld/unittests/CMakeLists.txt b/lld/unittests/CMakeLists.txt index 88cb85a08401..84d35d43f4e8 100644 --- a/lld/unittests/CMakeLists.txt +++ b/lld/unittests/CMakeLists.txt @@ -12,9 +12,5 @@ function(add_lld_unittest test_dirname) target_link_libraries(${test_dirname} ${LLVM_COMMON_LIBS}) endfunction() -if (CXX_SUPPORTS_SUGGEST_OVERRIDE_FLAG) - add_compile_options("-Wno-suggest-override") -endif() - add_subdirectory(DriverTests) add_subdirectory(MachOTests) diff --git a/llvm/lib/Testing/Support/CMakeLists.txt b/llvm/lib/Testing/Support/CMakeLists.txt index 595221a105cd..fe460aeefc91 100644 --- a/llvm/lib/Testing/Support/CMakeLists.txt +++ b/llvm/lib/Testing/Support/CMakeLists.txt @@ -1,10 +1,6 @@ add_definitions(-DGTEST_LANG_CXX11=1) add_definitions(-DGTEST_HAS_TR1_TUPLE=0) -if (CXX_SUPPORTS_SUGGEST_OVERRIDE_FLAG) - add_compile_options("-Wno-suggest-override") -endif() - add_llvm_library(LLVMTestingSupport Annotations.cpp Error.cpp diff --git a/llvm/unittests/CMakeLists.txt b/llvm/unittests/CMakeLists.txt index e90f07448c10..d7dbaeaa32fe 100644 --- a/llvm/unittests/CMakeLists.txt +++ b/llvm/unittests/CMakeLists.txt @@ -14,10 +14,6 @@ function(add_llvm_target_unittest test_dir_name) add_llvm_unittest(${test_dir_name} DISABLE_LLVM_LINK_LLVM_DYLIB ${ARGN}) endfunction() -if (CXX_SUPPORTS_SUGGEST_OVERRIDE_FLAG) - add_compile_options("-Wno-suggest-override") -endif() - add_subdirectory(ADT) add_subdirectory(Analysis) add_subdirectory(AsmParser) diff --git a/llvm/utils/unittest/CMakeLists.txt b/llvm/utils/unittest/CMakeLists.txt index 36761a60d9f7..bcae36fa150d 100644 --- a/llvm/utils/unittest/CMakeLists.txt +++ b/llvm/utils/unittest/CMakeLists.txt @@ -43,9 +43,6 @@ endif() if(CXX_SUPPORTS_COVERED_SWITCH_DEFAULT_FLAG) add_definitions("-Wno-covered-switch-default") endif() -if(CXX_SUPPORTS_SUGGEST_OVERRIDE_FLAG) - add_definitions("-Wno-suggest-override") -endif() set(LLVM_REQUIRES_RTTI 1) add_definitions( -DGTEST_HAS_RTTI=0 ) @@ -73,6 +70,14 @@ add_llvm_library(gtest BUILDTREE_ONLY ) +# The googletest and googlemock sources don't presently use the 'override' +# keyword, which leads to lots of warnings from -Wsuggest-override. Disable +# that warning here for any targets that link to gtest. +if(CXX_SUPPORTS_SUGGEST_OVERRIDE_FLAG) + add_definitions("-Wno-suggest-override") + set_target_properties(gtest PROPERTIES INTERFACE_COMPILE_OPTIONS "-Wno-suggest-override") +endif() + add_subdirectory(UnitTestMain) # When LLVM_LINK_LLVM_DYLIB is enabled, libLLVM.so is added to the interface diff --git a/mlir/unittests/CMakeLists.txt b/mlir/unittests/CMakeLists.txt index 1dc07413a885..851092c5b56a 100644 --- a/mlir/unittests/CMakeLists.txt +++ b/mlir/unittests/CMakeLists.txt @@ -5,10 +5,6 @@ function(add_mlir_unittest test_dirname) add_unittest(MLIRUnitTests ${test_dirname} ${ARGN}) endfunction() -if (CXX_SUPPORTS_SUGGEST_OVERRIDE_FLAG) - add_compile_options("-Wno-suggest-override") -endif() - add_subdirectory(Analysis) add_subdirectory(Dialect) add_subdirectory(IR) diff --git a/polly/unittests/CMakeLists.txt b/polly/unittests/CMakeLists.txt index 1a6881fde3fd..fac70383de94 100644 --- a/polly/unittests/CMakeLists.txt +++ b/polly/unittests/CMakeLists.txt @@ -19,10 +19,6 @@ function(add_polly_unittest test_name) target_link_libraries(${test_name} PRIVATE Polly) endfunction() -if (CXX_SUPPORTS_SUGGEST_OVERRIDE_FLAG) - add_compile_options("-Wno-suggest-override") -endif() - add_subdirectory(Isl) add_subdirectory(Flatten) add_subdirectory(DeLICM) _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
