From 9d4ae910eb45ccd70c665e2de8cf3ac3dea02836 Mon Sep 17 00:00:00 2001 From: cvh Date: Mon, 2 May 2016 21:56:13 +0200 Subject: [PATCH] tinyxml2: fix disable shared patch --- ...ml2-0001-really-disable-shared-build.patch | 61 +++++++++---------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/packages/textproc/tinyxml2/patches/tinyxml2-0001-really-disable-shared-build.patch b/packages/textproc/tinyxml2/patches/tinyxml2-0001-really-disable-shared-build.patch index f9bcb6d474..917c759d14 100644 --- a/packages/textproc/tinyxml2/patches/tinyxml2-0001-really-disable-shared-build.patch +++ b/packages/textproc/tinyxml2/patches/tinyxml2-0001-really-disable-shared-build.patch @@ -1,31 +1,30 @@ -diff -Naur a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2013-10-26 21:52:35.000000000 -0700 -+++ b/CMakeLists.txt 2016-04-17 13:49:47.504923855 -0700 -@@ -51,26 +51,12 @@ - add_library(tinyxml2static STATIC tinyxml2.cpp tinyxml2.h) - set_target_properties(tinyxml2static PROPERTIES OUTPUT_NAME tinyxml2) - endif(BUILD_STATIC_LIBS) --add_library(tinyxml2 SHARED tinyxml2.cpp tinyxml2.h) --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) -- - - if(BUILD_STATIC_LIBS) -- install(TARGETS tinyxml2 tinyxml2static -+ install(TARGETS tinyxml2static - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) --else(BUILD_STATIC_LIBS) -- install(TARGETS tinyxml2 -- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif(BUILD_STATIC_LIBS) - install(FILES tinyxml2.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) - +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -51,26 +51,12 @@ if(BUILD_STATIC_LIBS) + add_library(tinyxml2static STATIC tinyxml2.cpp tinyxml2.h) + set_target_properties(tinyxml2static PROPERTIES OUTPUT_NAME tinyxml2) + endif(BUILD_STATIC_LIBS) +-add_library(tinyxml2 SHARED tinyxml2.cpp tinyxml2.h) +-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) +- + + if(BUILD_STATIC_LIBS) +- install(TARGETS tinyxml2 tinyxml2static ++ install(TARGETS tinyxml2static + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) +-else(BUILD_STATIC_LIBS) +- install(TARGETS tinyxml2 +- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + endif(BUILD_STATIC_LIBS) + install(FILES tinyxml2.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) +