logan-5 created this revision.
logan-5 added a reviewer: labath.
Herald added subscribers: llvm-commits, cfe-commits, msifontes, jurahul,
Kayjukh, grosul1, Joonsoo, stephenneuendorffer, liufengdb, aartbik, lucyrfox,
mgester, arpith-jacob, nicolasvasilache, antiagainst, shauheen, jpienaar,
rriddle, mehdi_amini, usaxena95, kadircet, arphaman, jkorous, hiraditya, mgorny.
Herald added a reviewer: bollu.
Herald added a reviewer: DavidTruby.
Herald added projects: clang, MLIR, LLVM.
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.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D84554
Files:
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
Index: polly/unittests/CMakeLists.txt
===================================================================
--- polly/unittests/CMakeLists.txt
+++ polly/unittests/CMakeLists.txt
@@ -19,10 +19,6 @@
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)
Index: mlir/unittests/CMakeLists.txt
===================================================================
--- mlir/unittests/CMakeLists.txt
+++ mlir/unittests/CMakeLists.txt
@@ -5,10 +5,6 @@
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)
Index: llvm/utils/unittest/CMakeLists.txt
===================================================================
--- llvm/utils/unittest/CMakeLists.txt
+++ llvm/utils/unittest/CMakeLists.txt
@@ -43,9 +43,6 @@
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 @@
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
Index: llvm/unittests/CMakeLists.txt
===================================================================
--- llvm/unittests/CMakeLists.txt
+++ llvm/unittests/CMakeLists.txt
@@ -14,10 +14,6 @@
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)
Index: llvm/lib/Testing/Support/CMakeLists.txt
===================================================================
--- llvm/lib/Testing/Support/CMakeLists.txt
+++ 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
Index: lld/unittests/CMakeLists.txt
===================================================================
--- lld/unittests/CMakeLists.txt
+++ lld/unittests/CMakeLists.txt
@@ -12,9 +12,5 @@
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)
Index: clang/unittests/CMakeLists.txt
===================================================================
--- clang/unittests/CMakeLists.txt
+++ 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
Index: clang-tools-extra/unittests/CMakeLists.txt
===================================================================
--- clang-tools-extra/unittests/CMakeLists.txt
+++ clang-tools-extra/unittests/CMakeLists.txt
@@ -5,10 +5,6 @@
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)
Index: clang-tools-extra/clangd/unittests/CMakeLists.txt
===================================================================
--- clang-tools-extra/clangd/unittests/CMakeLists.txt
+++ clang-tools-extra/clangd/unittests/CMakeLists.txt
@@ -13,10 +13,6 @@
${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
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
