ecea410030
This commit fixes the line endings of the tinyxml2 patches added in commits22f5be171c
and0fa452df18
. Thanks to Romain Naour for providing the correct version of the patches. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
39 lines
1.3 KiB
Diff
39 lines
1.3 KiB
Diff
From 77631a9cf500a578338a83bc230c419bf2a05b50 Mon Sep 17 00:00:00 2001
|
|
From: xantares <xantares09@hotmail.com>
|
|
Date: Fri, 14 Nov 2014 19:46:18 +0100
|
|
Subject: [PATCH] Rename test, fixed cmake warning.
|
|
|
|
Signed-off-by: Romain Naour <romain.naour@openwide.fr>
|
|
---
|
|
CMakeLists.txt | 10 +++++-----
|
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 4375bb9..4a8f91d 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -53,10 +53,10 @@ set_target_properties(tinyxml2 PROPERTIES
|
|
VERSION "${GENERIC_LIB_VERSION}"
|
|
SOVERSION "${GENERIC_LIB_SOVERSION}")
|
|
|
|
-add_executable(test xmltest.cpp)
|
|
-add_dependencies(test tinyxml2)
|
|
-add_dependencies(test ${TARGET_DATA_COPY})
|
|
-target_link_libraries(test tinyxml2)
|
|
+add_executable(xmltest xmltest.cpp)
|
|
+add_dependencies(xmltest tinyxml2)
|
|
+add_dependencies(xmltest ${TARGET_DATA_COPY})
|
|
+target_link_libraries(xmltest tinyxml2)
|
|
|
|
|
|
install(TARGETS tinyxml2
|
|
@@ -76,4 +76,4 @@ endforeach()
|
|
configure_file(tinyxml2.pc.in tinyxml2.pc @ONLY)
|
|
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/tinyxml2.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
|
|
|
|
-#add_test(test ${SAMPLE_NAME} COMMAND $<TARGET_FILE:${SAMPLE_NAME}>)
|
|
+#add_test(xmltest ${SAMPLE_NAME} COMMAND $<TARGET_FILE:${SAMPLE_NAME}>)
|
|
--
|
|
1.9.3
|
|
|