CMake: used link_libraries() instead of target_link_libraries()

2020-05-03 10:25:38 +02:00
parent 3b923b6e4e
commit dcf7eeef28
17 changed files with 4 additions and 84 deletions
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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()


--- 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)
--- 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)
--- 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)
--- 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)
--- 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)