Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[tinyxml2] Update to 8.0.0; avoid exporting symbols when building static libraries #11616

Merged
merged 2 commits into from
Jun 12, 2020
Merged

[tinyxml2] Update to 8.0.0; avoid exporting symbols when building static libraries #11616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4a5871
[tinyxml2] Update to 8.0.0; avoid exporting symbols when building sta…
orudge May 27, 2020
7e4a581
[tinyxml2] Clean up files
orudge May 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions ports/tinyxml2/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
Source: tinyxml2
Version: 7.1.0
Version: 8.0.0
Homepage: https://github.com/leethomason/tinyxml2
Description: A simple, small, efficient, C++ XML parser

36 changes: 36 additions & 0 deletions ports/tinyxml2/fix-symbol-exports.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
From f8b048656b9937252ce5fb4ebea9e5df5b203bdb Mon Sep 17 00:00:00 2001
From: Owen Rudge <[email protected]>
Date: Wed, 27 May 2020 09:40:59 +0100
Subject: [PATCH] cmake: Don't export symbols if building static library

---
CMakeLists.txt | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9f9ab07..67b4f33 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,10 +50,16 @@ set(CMAKE_DEBUG_POSTFIX "d")

add_library(tinyxml2 tinyxml2.cpp tinyxml2.h)

-set_target_properties(tinyxml2 PROPERTIES
+if(BUILD_SHARED_LIBS)
+ set_target_properties(tinyxml2 PROPERTIES
COMPILE_DEFINITIONS "TINYXML2_EXPORT"
- VERSION "${GENERIC_LIB_VERSION}"
- SOVERSION "${GENERIC_LIB_SOVERSION}")
+ VERSION "${GENERIC_LIB_VERSION}"
+ SOVERSION "${GENERIC_LIB_SOVERSION}")
+else()
+ set_target_properties(tinyxml2 PROPERTIES
+ VERSION "${GENERIC_LIB_VERSION}"
+ SOVERSION "${GENERIC_LIB_SOVERSION}")
+endif()

target_compile_definitions(tinyxml2 PUBLIC $<$<CONFIG:Debug>:TINYXML2_DEBUG>)

--
2.25.1.windows.1

14 changes: 5 additions & 9 deletions ports/tinyxml2/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
include(vcpkg_common_functions)

vcpkg_from_github(
NancyLi1013 marked this conversation as resolved.
Show resolved Hide resolved
OUT_SOURCE_PATH SOURCE_PATH
REPO leethomason/tinyxml2
REF 9c740e8d2341bd46dbe8e87053cdb4d931971967 # 7.1.0
SHA512 a0e9634875f4c5f426f41510040b9f078af24adf176d2daf3cb3343d629b8068f3a1841df80a06d977bd19e3acaaa3736719a900754c1fe675631f3337820130
REF 8.0.0
SHA512 bcbb065c2af34ea681ec556377fd22e720b6f5d4caa73f432b1e34e08603a96f2233763f0ec5ae86b9ee71ddbe3062f58d3794cd3a162ce6903435530de0bba6
HEAD_REF master
PATCHES
fix-symbol-exports.patch
)

NancyLi1013 marked this conversation as resolved.
Show resolved Hide resolved
vcpkg_configure_cmake(
Expand All @@ -22,8 +22,4 @@ vcpkg_copy_pdbs()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)

file(COPY
${SOURCE_PATH}/readme.md
DESTINATION ${CURRENT_PACKAGES_DIR}/share/tinyxml2
)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/tinyxml2/readme.md ${CURRENT_PACKAGES_DIR}/share/tinyxml2/copyright)
file(INSTALL ${SOURCE_PATH}/readme.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)