aboutsummaryrefslogtreecommitdiff
path: root/ports/tinyxml2
diff options
context:
space:
mode:
authorDaniel Shaw <t-dansha@microsoft.com>2017-07-14 13:22:09 -0700
committerDaniel Shaw <t-dansha@microsoft.com>2017-07-14 13:22:09 -0700
commit4f7f1cf5d159f69af5f10925245799dc91af7968 (patch)
tree9495a6abfe8494d8276dadef6c160e88d35128f1 /ports/tinyxml2
parent336e25218a73f9b54120e3c35b3d28e6426deeb1 (diff)
parent2055a9cd4490861aa7ce9e1af23c0232f97552c9 (diff)
downloadvcpkg-4f7f1cf5d159f69af5f10925245799dc91af7968.tar.gz
vcpkg-4f7f1cf5d159f69af5f10925245799dc91af7968.zip
Merge remote-tracking branch 'origin' into create_install_tests
Diffstat (limited to 'ports/tinyxml2')
-rw-r--r--ports/tinyxml2/CONTROL4
-rw-r--r--ports/tinyxml2/portfile.cmake12
2 files changed, 12 insertions, 4 deletions
diff --git a/ports/tinyxml2/CONTROL b/ports/tinyxml2/CONTROL
index ee5e20f34..aaa9a7c4f 100644
--- a/ports/tinyxml2/CONTROL
+++ b/ports/tinyxml2/CONTROL
@@ -1,3 +1,3 @@
Source: tinyxml2
-Version: 5.0.0
-Description: A simple, small, efficient, C++ XML parser \ No newline at end of file
+Version: 5.0.1
+Description: A simple, small, efficient, C++ XML parser
diff --git a/ports/tinyxml2/portfile.cmake b/ports/tinyxml2/portfile.cmake
index 59184178d..0c8b0b84b 100644
--- a/ports/tinyxml2/portfile.cmake
+++ b/ports/tinyxml2/portfile.cmake
@@ -3,13 +3,21 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO leethomason/tinyxml2
- REF 5.0.0
- SHA512 ef310a466d0aec9dd0d25063c68f5312cd063366ee57499d8e462e25a556ea510617b66cdec1a368e8867dc082e0297e27fe09f16eb915392235be34206881e4
+ REF 5.0.1
+ SHA512 a51ec5843774df0482620c549fb6c61d30a6db5025be26ff6d25b3c53533a27a57f00b026bd9fbca78e9e30084b3f5f6fbff9dba315d078419da084b57f518ba
HEAD_REF master
)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+ set(BUILD_STATIC_LIBS 1)
+else()
+ set(BUILD_STATIC_LIBS 0)
+endif()
+
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
+ OPTIONS
+ -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
)
vcpkg_install_cmake()