mirror of
https://github.com/capstone-engine/llvm-capstone.git
synced 2025-01-31 22:25:56 +00:00
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
This commit is contained in:
parent
48c948abeb
commit
a52aea0ba6
@ -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
|
||||
|
@ -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)
|
||||
|
@ -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
|
||||
|
@ -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)
|
||||
|
@ -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
|
||||
|
@ -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)
|
||||
|
@ -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
|
||||
|
@ -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)
|
||||
|
@ -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)
|
||||
|
Loading…
x
Reference in New Issue
Block a user