diff --git a/extras/tests/CMakeLists.txt b/extras/tests/CMakeLists.txt index b150a953..09ff4122 100644 --- a/extras/tests/CMakeLists.txt +++ b/extras/tests/CMakeLists.txt @@ -4,6 +4,8 @@ add_subdirectory(catch) +link_libraries(ArduinoJson catch) + include_directories(Helpers) add_subdirectory(ElementProxy) add_subdirectory(IntegrationTests) diff --git a/extras/tests/ElementProxy/CMakeLists.txt b/extras/tests/ElementProxy/CMakeLists.txt index 4443dc3f..f86d6bb0 100644 --- a/extras/tests/ElementProxy/CMakeLists.txt +++ b/extras/tests/ElementProxy/CMakeLists.txt @@ -11,9 +11,4 @@ add_executable(ElementProxyTests size.cpp ) -target_link_libraries(ElementProxyTests - ArduinoJson - catch -) - add_test(ElementProxy ElementProxyTests) diff --git a/extras/tests/IntegrationTests/CMakeLists.txt b/extras/tests/IntegrationTests/CMakeLists.txt index 36e9fa16..556a70da 100644 --- a/extras/tests/IntegrationTests/CMakeLists.txt +++ b/extras/tests/IntegrationTests/CMakeLists.txt @@ -16,9 +16,4 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU") ) endif() -target_link_libraries(IntegrationTests - ArduinoJson - catch -) - add_test(IntegrationTests IntegrationTests) diff --git a/extras/tests/JsonArray/CMakeLists.txt b/extras/tests/JsonArray/CMakeLists.txt index c1b08bc3..dd2ac36f 100644 --- a/extras/tests/JsonArray/CMakeLists.txt +++ b/extras/tests/JsonArray/CMakeLists.txt @@ -19,9 +19,4 @@ add_executable(JsonArrayTests undefined.cpp ) -target_link_libraries(JsonArrayTests - ArduinoJson - catch -) - add_test(JsonArray JsonArrayTests) diff --git a/extras/tests/JsonDeserializer/CMakeLists.txt b/extras/tests/JsonDeserializer/CMakeLists.txt index b90524f5..805ee0e8 100644 --- a/extras/tests/JsonDeserializer/CMakeLists.txt +++ b/extras/tests/JsonDeserializer/CMakeLists.txt @@ -18,11 +18,6 @@ add_executable(JsonDeserializerTests string.cpp ) -target_link_libraries(JsonDeserializerTests - ArduinoJson - catch -) - set_target_properties(JsonDeserializerTests PROPERTIES UNITY_BUILD OFF) add_test(JsonDeserializer JsonDeserializerTests) diff --git a/extras/tests/JsonDocument/CMakeLists.txt b/extras/tests/JsonDocument/CMakeLists.txt index 2a90645c..5a083a68 100644 --- a/extras/tests/JsonDocument/CMakeLists.txt +++ b/extras/tests/JsonDocument/CMakeLists.txt @@ -18,9 +18,4 @@ add_executable(JsonDocumentTests subscript.cpp ) -target_link_libraries(JsonDocumentTests - ArduinoJson - catch -) - add_test(JsonDocument JsonDocumentTests) diff --git a/extras/tests/JsonObject/CMakeLists.txt b/extras/tests/JsonObject/CMakeLists.txt index 89d79039..5339f444 100644 --- a/extras/tests/JsonObject/CMakeLists.txt +++ b/extras/tests/JsonObject/CMakeLists.txt @@ -19,9 +19,4 @@ add_executable(JsonObjectTests subscript.cpp ) -target_link_libraries(JsonObjectTests - ArduinoJson - catch -) - add_test(JsonObject JsonObjectTests) diff --git a/extras/tests/JsonSerializer/CMakeLists.txt b/extras/tests/JsonSerializer/CMakeLists.txt index f2128055..2d0b390e 100644 --- a/extras/tests/JsonSerializer/CMakeLists.txt +++ b/extras/tests/JsonSerializer/CMakeLists.txt @@ -14,9 +14,4 @@ add_executable(JsonSerializerTests std_string.cpp ) -target_link_libraries(JsonSerializerTests - ArduinoJson - catch -) - add_test(JsonSerializer JsonSerializerTests) diff --git a/extras/tests/JsonVariant/CMakeLists.txt b/extras/tests/JsonVariant/CMakeLists.txt index fc77d350..2d4d7897 100644 --- a/extras/tests/JsonVariant/CMakeLists.txt +++ b/extras/tests/JsonVariant/CMakeLists.txt @@ -24,9 +24,4 @@ add_executable(JsonVariantTests undefined.cpp ) -target_link_libraries(JsonVariantTests - ArduinoJson - catch -) - add_test(JsonVariant JsonVariantTests) diff --git a/extras/tests/MemberProxy/CMakeLists.txt b/extras/tests/MemberProxy/CMakeLists.txt index 5fb3826f..6d4c0f6f 100644 --- a/extras/tests/MemberProxy/CMakeLists.txt +++ b/extras/tests/MemberProxy/CMakeLists.txt @@ -13,9 +13,4 @@ add_executable(MemberProxyTests subscript.cpp ) -target_link_libraries(MemberProxyTests - ArduinoJson - catch -) - add_test(MemberProxy MemberProxyTests) diff --git a/extras/tests/MemoryPool/CMakeLists.txt b/extras/tests/MemoryPool/CMakeLists.txt index 794b4818..1ff0c0db 100644 --- a/extras/tests/MemoryPool/CMakeLists.txt +++ b/extras/tests/MemoryPool/CMakeLists.txt @@ -10,9 +10,4 @@ add_executable(MemoryPoolTests StringBuilder.cpp ) -target_link_libraries(MemoryPoolTests - ArduinoJson - catch -) - add_test(MemoryPool MemoryPoolTests) diff --git a/extras/tests/Misc/CMakeLists.txt b/extras/tests/Misc/CMakeLists.txt index 221476c9..28d8bbef 100644 --- a/extras/tests/Misc/CMakeLists.txt +++ b/extras/tests/Misc/CMakeLists.txt @@ -15,11 +15,6 @@ add_executable(MiscTests version.cpp ) -target_link_libraries(MiscTests - ArduinoJson - catch -) - set_target_properties(MiscTests PROPERTIES UNITY_BUILD OFF) add_test(Misc MiscTests) @@ -39,11 +34,9 @@ macro(build_should_fail target) ${CMAKE_BINARY_DIR} ) set_tests_properties(${target} - - - PROPERTIES - WILL_FAIL TRUE) + WILL_FAIL TRUE + ) endmacro() diff --git a/extras/tests/MixedConfiguration/CMakeLists.txt b/extras/tests/MixedConfiguration/CMakeLists.txt index 746912f2..650b244c 100644 --- a/extras/tests/MixedConfiguration/CMakeLists.txt +++ b/extras/tests/MixedConfiguration/CMakeLists.txt @@ -24,11 +24,6 @@ add_executable(MixedConfigurationTests use_long_long_1.cpp ) -target_link_libraries(MixedConfigurationTests - ArduinoJson - catch -) - set_target_properties(MixedConfigurationTests PROPERTIES UNITY_BUILD OFF) add_test(MixedConfiguration MixedConfigurationTests) diff --git a/extras/tests/MsgPackDeserializer/CMakeLists.txt b/extras/tests/MsgPackDeserializer/CMakeLists.txt index 756629c3..f3f52f08 100644 --- a/extras/tests/MsgPackDeserializer/CMakeLists.txt +++ b/extras/tests/MsgPackDeserializer/CMakeLists.txt @@ -14,9 +14,4 @@ add_executable(MsgPackDeserializerTests notSupported.cpp ) -target_link_libraries(MsgPackDeserializerTests - ArduinoJson - catch -) - add_test(MsgPackDeserializer MsgPackDeserializerTests) diff --git a/extras/tests/MsgPackSerializer/CMakeLists.txt b/extras/tests/MsgPackSerializer/CMakeLists.txt index d8de4175..ccb7cb6a 100644 --- a/extras/tests/MsgPackSerializer/CMakeLists.txt +++ b/extras/tests/MsgPackSerializer/CMakeLists.txt @@ -11,9 +11,4 @@ add_executable(MsgPackSerializerTests serializeVariant.cpp ) -target_link_libraries(MsgPackSerializerTests - ArduinoJson - catch -) - add_test(MsgPackSerializer MsgPackSerializerTests) diff --git a/extras/tests/Numbers/CMakeLists.txt b/extras/tests/Numbers/CMakeLists.txt index 1ae6713b..50ab5135 100644 --- a/extras/tests/Numbers/CMakeLists.txt +++ b/extras/tests/Numbers/CMakeLists.txt @@ -8,10 +8,5 @@ add_executable(NumbersTests parseNumber.cpp ) -target_link_libraries(NumbersTests - ArduinoJson - catch -) - add_test(Numbers NumbersTests) diff --git a/extras/tests/TextFormatter/CMakeLists.txt b/extras/tests/TextFormatter/CMakeLists.txt index e96efcfa..41f5c97c 100644 --- a/extras/tests/TextFormatter/CMakeLists.txt +++ b/extras/tests/TextFormatter/CMakeLists.txt @@ -7,11 +7,6 @@ add_executable(TextFormatterTests writeString.cpp ) -target_link_libraries(TextFormatterTests - ArduinoJson - catch -) - set_target_properties(TextFormatterTests PROPERTIES UNITY_BUILD OFF) add_test(TextFormatter TextFormatterTests)