feedc0de/ArduinoJson
1
0
Fork 0
forked from bblanchon/ArduinoJson
Code Pull Requests Activity

CMake: used link_libraries() instead of target_link_libraries()

Browse Source
This commit is contained in:
Benoit Blanchon
2020-05-03 10:25:38 +02:00
parent 3b923b6e4e
commit dcf7eeef28
17 changed files with 4 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extras/tests/CMakeLists.txt
View File

@ -4,6 +4,8 @@
add_subdirectory(catch) add_subdirectory(catch)
link_libraries(ArduinoJson catch)
include_directories(Helpers) include_directories(Helpers)
add_subdirectory(ElementProxy) add_subdirectory(ElementProxy)
add_subdirectory(IntegrationTests) add_subdirectory(IntegrationTests)

5
extras/tests/ElementProxy/CMakeLists.txt
View File

@ -11,9 +11,4 @@ add_executable(ElementProxyTests
size.cpp size.cpp
) )
target_link_libraries(ElementProxyTests
ArduinoJson
catch
)
add_test(ElementProxy ElementProxyTests) add_test(ElementProxy ElementProxyTests)

5
extras/tests/IntegrationTests/CMakeLists.txt
View File

@ -16,9 +16,4 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
) )
endif() endif()
target_link_libraries(IntegrationTests
ArduinoJson
catch
)
add_test(IntegrationTests IntegrationTests) add_test(IntegrationTests IntegrationTests)

5
extras/tests/JsonArray/CMakeLists.txt
View File

@ -19,9 +19,4 @@ add_executable(JsonArrayTests
undefined.cpp undefined.cpp
) )
target_link_libraries(JsonArrayTests
ArduinoJson
catch
)
add_test(JsonArray JsonArrayTests) add_test(JsonArray JsonArrayTests)

5
extras/tests/JsonDeserializer/CMakeLists.txt
View File

@ -18,11 +18,6 @@ add_executable(JsonDeserializerTests
string.cpp string.cpp
) )
target_link_libraries(JsonDeserializerTests
ArduinoJson
catch
)
set_target_properties(JsonDeserializerTests PROPERTIES UNITY_BUILD OFF) set_target_properties(JsonDeserializerTests PROPERTIES UNITY_BUILD OFF)
add_test(JsonDeserializer JsonDeserializerTests) add_test(JsonDeserializer JsonDeserializerTests)

5
extras/tests/JsonDocument/CMakeLists.txt
View File

@ -18,9 +18,4 @@ add_executable(JsonDocumentTests
subscript.cpp subscript.cpp
) )
target_link_libraries(JsonDocumentTests
ArduinoJson
catch
)
add_test(JsonDocument JsonDocumentTests) add_test(JsonDocument JsonDocumentTests)

5
extras/tests/JsonObject/CMakeLists.txt
View File

@ -19,9 +19,4 @@ add_executable(JsonObjectTests
subscript.cpp subscript.cpp
) )
target_link_libraries(JsonObjectTests
ArduinoJson
catch
)
add_test(JsonObject JsonObjectTests) add_test(JsonObject JsonObjectTests)

5
extras/tests/JsonSerializer/CMakeLists.txt
View File

@ -14,9 +14,4 @@ add_executable(JsonSerializerTests
std_string.cpp std_string.cpp
) )
target_link_libraries(JsonSerializerTests
ArduinoJson
catch
)
add_test(JsonSerializer JsonSerializerTests) add_test(JsonSerializer JsonSerializerTests)

5
extras/tests/JsonVariant/CMakeLists.txt
View File

@ -24,9 +24,4 @@ add_executable(JsonVariantTests
undefined.cpp undefined.cpp
) )
target_link_libraries(JsonVariantTests
ArduinoJson
catch
)
add_test(JsonVariant JsonVariantTests) add_test(JsonVariant JsonVariantTests)

5
extras/tests/MemberProxy/CMakeLists.txt
View File

@ -13,9 +13,4 @@ add_executable(MemberProxyTests
subscript.cpp subscript.cpp
) )
target_link_libraries(MemberProxyTests
ArduinoJson
catch
)
add_test(MemberProxy MemberProxyTests) add_test(MemberProxy MemberProxyTests)

5
extras/tests/MemoryPool/CMakeLists.txt
View File

@ -10,9 +10,4 @@ add_executable(MemoryPoolTests
StringBuilder.cpp StringBuilder.cpp
) )
target_link_libraries(MemoryPoolTests
ArduinoJson
catch
)
add_test(MemoryPool MemoryPoolTests) add_test(MemoryPool MemoryPoolTests)

11
extras/tests/Misc/CMakeLists.txt
View File

@ -15,11 +15,6 @@ add_executable(MiscTests
version.cpp version.cpp
) )
target_link_libraries(MiscTests
ArduinoJson
catch
)
set_target_properties(MiscTests PROPERTIES UNITY_BUILD OFF) set_target_properties(MiscTests PROPERTIES UNITY_BUILD OFF)
add_test(Misc MiscTests) add_test(Misc MiscTests)
@ -39,11 +34,9 @@ macro(build_should_fail target)
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
) )
set_tests_properties(${target} set_tests_properties(${target}
PROPERTIES PROPERTIES
WILL_FAIL TRUE) WILL_FAIL TRUE
)
endmacro() endmacro()

5
extras/tests/MixedConfiguration/CMakeLists.txt
View File

@ -24,11 +24,6 @@ add_executable(MixedConfigurationTests
use_long_long_1.cpp use_long_long_1.cpp
) )
target_link_libraries(MixedConfigurationTests
ArduinoJson
catch
)
set_target_properties(MixedConfigurationTests PROPERTIES UNITY_BUILD OFF) set_target_properties(MixedConfigurationTests PROPERTIES UNITY_BUILD OFF)
add_test(MixedConfiguration MixedConfigurationTests) add_test(MixedConfiguration MixedConfigurationTests)

5
extras/tests/MsgPackDeserializer/CMakeLists.txt
View File

@ -14,9 +14,4 @@ add_executable(MsgPackDeserializerTests
notSupported.cpp notSupported.cpp
) )
target_link_libraries(MsgPackDeserializerTests
ArduinoJson
catch
)
add_test(MsgPackDeserializer MsgPackDeserializerTests) add_test(MsgPackDeserializer MsgPackDeserializerTests)

5
extras/tests/MsgPackSerializer/CMakeLists.txt
View File

@ -11,9 +11,4 @@ add_executable(MsgPackSerializerTests
serializeVariant.cpp serializeVariant.cpp
) )
target_link_libraries(MsgPackSerializerTests
ArduinoJson
catch
)
add_test(MsgPackSerializer MsgPackSerializerTests) add_test(MsgPackSerializer MsgPackSerializerTests)

5
extras/tests/Numbers/CMakeLists.txt
View File

@ -8,10 +8,5 @@ add_executable(NumbersTests
parseNumber.cpp parseNumber.cpp
) )
target_link_libraries(NumbersTests
ArduinoJson
catch
)
add_test(Numbers NumbersTests) add_test(Numbers NumbersTests)

5
extras/tests/TextFormatter/CMakeLists.txt
View File

@ -7,11 +7,6 @@ add_executable(TextFormatterTests
writeString.cpp writeString.cpp
) )
target_link_libraries(TextFormatterTests
ArduinoJson
catch
)
set_target_properties(TextFormatterTests PROPERTIES UNITY_BUILD OFF) set_target_properties(TextFormatterTests PROPERTIES UNITY_BUILD OFF)
add_test(TextFormatter TextFormatterTests) add_test(TextFormatter TextFormatterTests)