jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-08-01 23:47:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

tinyxml2: fix line-endings of patches

Browse Source 
This commit fixes the line endings of the tinyxml2 patches added in
commits 22f5be171c6f9bb2611e7b87197e9faeabcaab18 and
0fa452df185545d3781b3015195bee9431496b5d. Thanks to Romain Naour for
providing the correct version of the patches.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Thomas Petazzoni 2015-05-16 18:26:44 +02:00
parent e678b07bad
commit ecea410030
2 changed files with 62 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
package/tinyxml2/0001-Use-BUILD_SHARED_LIBS-cmake-standard.patch
View File

@ -13,53 +13,53 @@ index 91c61a4..4375bb9 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -10,8 +10,8 @@ include(GNUInstallDirs) @@ -10,8 +10,8 @@ include(GNUInstallDirs)
################################ ################################
# set lib version here # set lib version here
-set(GENERIC_LIB_VERSION "2.2.0") -set(GENERIC_LIB_VERSION "2.2.0")
-set(GENERIC_LIB_SOVERSION "2") -set(GENERIC_LIB_SOVERSION "2")
+set(GENERIC_LIB_VERSION "2.2.0") +set(GENERIC_LIB_VERSION "2.2.0")
+set(GENERIC_LIB_SOVERSION "2") +set(GENERIC_LIB_SOVERSION "2")
################################ ################################
@@ -46,12 +46,8 @@ endif(MSVC) @@ -46,12 +46,8 @@ endif(MSVC)
################################ ################################
# Add targets # Add targets
-set(BUILD_STATIC_LIBS ON CACHE BOOL "Set to ON to build static libraries") -set(BUILD_STATIC_LIBS ON CACHE BOOL "Set to ON to build static libraries")
-if(BUILD_STATIC_LIBS) -if(BUILD_STATIC_LIBS)
- add_library(tinyxml2static STATIC tinyxml2.cpp tinyxml2.h) - add_library(tinyxml2static STATIC tinyxml2.cpp tinyxml2.h)
- set_target_properties(tinyxml2static PROPERTIES OUTPUT_NAME tinyxml2) - set_target_properties(tinyxml2static PROPERTIES OUTPUT_NAME tinyxml2)
-endif(BUILD_STATIC_LIBS) -endif(BUILD_STATIC_LIBS)
-add_library(tinyxml2 SHARED tinyxml2.cpp tinyxml2.h) -add_library(tinyxml2 SHARED tinyxml2.cpp tinyxml2.h)
+option(BUILD_SHARED_LIBS "build shared or static libraries" ON) +option(BUILD_SHARED_LIBS "build shared or static libraries" ON)
+add_library(tinyxml2 tinyxml2.cpp tinyxml2.h) +add_library(tinyxml2 tinyxml2.cpp tinyxml2.h)
set_target_properties(tinyxml2 PROPERTIES set_target_properties(tinyxml2 PROPERTIES
COMPILE_DEFINITIONS "TINYXML2_EXPORT" COMPILE_DEFINITIONS "TINYXML2_EXPORT"
VERSION "${GENERIC_LIB_VERSION}" VERSION "${GENERIC_LIB_VERSION}"
@@ -63,16 +59,11 @@ add_dependencies(test ${TARGET_DATA_COPY}) @@ -63,16 +59,11 @@ add_dependencies(test ${TARGET_DATA_COPY})
target_link_libraries(test tinyxml2) target_link_libraries(test tinyxml2)
-if(BUILD_STATIC_LIBS) -if(BUILD_STATIC_LIBS)
- install(TARGETS tinyxml2 tinyxml2static - install(TARGETS tinyxml2 tinyxml2static
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-else(BUILD_STATIC_LIBS) -else(BUILD_STATIC_LIBS)
- install(TARGETS tinyxml2 - install(TARGETS tinyxml2
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-endif(BUILD_STATIC_LIBS) -endif(BUILD_STATIC_LIBS)
+install(TARGETS tinyxml2 +install(TARGETS tinyxml2
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ +
install(FILES tinyxml2.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) install(FILES tinyxml2.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
foreach(p LIB INCLUDE) foreach(p LIB INCLUDE)
-- --
1.9.3 1.9.3

38
package/tinyxml2/0002-Rename-test-fixed-cmake-warning.patch
View File

@ -13,26 +13,26 @@ index 4375bb9..4a8f91d 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -53,10 +53,10 @@ set_target_properties(tinyxml2 PROPERTIES @@ -53,10 +53,10 @@ set_target_properties(tinyxml2 PROPERTIES
VERSION "${GENERIC_LIB_VERSION}" VERSION "${GENERIC_LIB_VERSION}"
SOVERSION "${GENERIC_LIB_SOVERSION}") SOVERSION "${GENERIC_LIB_SOVERSION}")
-add_executable(test xmltest.cpp) -add_executable(test xmltest.cpp)
-add_dependencies(test tinyxml2) -add_dependencies(test tinyxml2)
-add_dependencies(test ${TARGET_DATA_COPY}) -add_dependencies(test ${TARGET_DATA_COPY})
-target_link_libraries(test tinyxml2) -target_link_libraries(test tinyxml2)
+add_executable(xmltest xmltest.cpp) +add_executable(xmltest xmltest.cpp)
+add_dependencies(xmltest tinyxml2) +add_dependencies(xmltest tinyxml2)
+add_dependencies(xmltest ${TARGET_DATA_COPY}) +add_dependencies(xmltest ${TARGET_DATA_COPY})
+target_link_libraries(xmltest tinyxml2) +target_link_libraries(xmltest tinyxml2)
install(TARGETS tinyxml2 install(TARGETS tinyxml2
@@ -76,4 +76,4 @@ endforeach() @@ -76,4 +76,4 @@ endforeach()
configure_file(tinyxml2.pc.in tinyxml2.pc @ONLY) configure_file(tinyxml2.pc.in tinyxml2.pc @ONLY)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/tinyxml2.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) 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(test ${SAMPLE_NAME} COMMAND $<TARGET_FILE:${SAMPLE_NAME}>)
+#add_test(xmltest ${SAMPLE_NAME} COMMAND $<TARGET_FILE:${SAMPLE_NAME}>) +#add_test(xmltest ${SAMPLE_NAME} COMMAND $<TARGET_FILE:${SAMPLE_NAME}>)
-- --
1.9.3 1.9.3