bblanchon/ArduinoJson
1
0
Fork 1
mirror of https://github.com/bblanchon/ArduinoJson.git synced 2025-07-30 02:37:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Tests: don't link FailingBuilds with catch

Browse Source
This commit is contained in:
Benoit Blanchon
2024-10-23 15:04:52 +02:00
parent 64cbaa6ff7
commit 20219d74f0
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
extras/tests/CMakeLists.txt
View File

@ -5,15 +5,18 @@
set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
add_subdirectory(catch) link_libraries(ArduinoJson)
link_libraries(ArduinoJson catch) # Failing builds should only link with ArduinoJson, not catch
add_subdirectory(FailingBuilds)
add_subdirectory(catch)
link_libraries(catch)
include_directories(Helpers) include_directories(Helpers)
add_subdirectory(Cpp17) add_subdirectory(Cpp17)
add_subdirectory(Cpp20) add_subdirectory(Cpp20)
add_subdirectory(Deprecated) add_subdirectory(Deprecated)
add_subdirectory(FailingBuilds)
add_subdirectory(IntegrationTests) add_subdirectory(IntegrationTests)
add_subdirectory(JsonArray) add_subdirectory(JsonArray)
add_subdirectory(JsonArrayConst) add_subdirectory(JsonArrayConst)

2
extras/tests/FailingBuilds/CMakeLists.txt
View File

@ -16,7 +16,7 @@ macro(build_should_fail target)
set_tests_properties(${target} set_tests_properties(${target}
PROPERTIES PROPERTIES
WILL_FAIL TRUE WILL_FAIL TRUE
LABELS "WillFail;Catch" LABELS "WillFail"
) )
endmacro() endmacro()