Skip to content

Commit 08ce6dc

Browse files
committed
cmake: Fix warning suppression for googletest build
In commit 27e9d56, we attempted to disable deprecated warnings when building googletest, but the implementation contained two errors: 1. The `set_property()` call occurred before adding the target directory, making it impossible to set properties on non-existent objects. 2. The `-Wno-deprecated-declarations` flag was incorrectly passed as an `APPEND` argument instead of a `PROPERTY` argument. This caused build failures with libstdc++-12 and newer Clang versions: ``` CMake Error at src/CMakeLists.txt:772 (set_property): set_property given invalid argument "-Wno-deprecated-declarations". ``` This commit fixes both issues by: - Moving the `set_property()` call after `add_subdirectory()` - Correctly passing the warning flag as a `PROPERTY` argument Signed-off-by: Kefu Chai <[email protected]>
1 parent bdb67a6 commit 08ce6dc

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -767,12 +767,6 @@ if(WITH_TESTS)
767767
find_package(GTest 1.13.0 REQUIRED)
768768
find_package(GMock REQUIRED)
769769
else()
770-
if(NOT COMPILER_IGNORES_DEPRECATED_DECL_IN_SYSTEM_HEADERS)
771-
# See https://github.com/llvm/llvm-project/issues/76515
772-
set_property(DIRECTORY googletest
773-
APPEND "-Wno-deprecated-declarations"
774-
PROPERTY COMPILE_OPTIONS)
775-
endif()
776770
set(INSTALL_GTEST OFF CACHE BOOL "" FORCE)
777771
add_subdirectory(googletest)
778772
add_library(GMock::GMock ALIAS gmock)
@@ -781,6 +775,12 @@ if(WITH_TESTS)
781775
$<TARGET_PROPERTY:gtest,INTERFACE_INCLUDE_DIRECTORIES>)
782776
target_include_directories(gmock_main INTERFACE
783777
$<TARGET_PROPERTY:gtest,INTERFACE_INCLUDE_DIRECTORIES>)
778+
if(NOT COMPILER_IGNORES_DEPRECATED_DECL_IN_SYSTEM_HEADERS)
779+
# See https://github.com/llvm/llvm-project/issues/76515
780+
set_property(DIRECTORY googletest
781+
APPEND
782+
PROPERTY COMPILE_OPTIONS "-Wno-deprecated-declarations")
783+
endif()
784784
add_library(GTest::GTest ALIAS gtest)
785785
add_library(GTest::Main ALIAS gtest_main)
786786
endif()

0 commit comments

Comments
 (0)