aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2017-06-21 17:22:56 -0700
committerGitHub <noreply@github.com>2017-06-21 17:22:56 -0700
commita9baf1d5ac53e477b3b8fdfa644bf129da3aef74 (patch)
tree2203e921d61bf6bc5909954660e52b35d7175b06
parentc697b40dc2efbecebcb5e74b97e36e219e1e5658 (diff)
parentd387490dc8e349741433ccff0d735cb31d088b78 (diff)
downloadvcpkg-a9baf1d5ac53e477b3b8fdfa644bf129da3aef74.tar.gz
vcpkg-a9baf1d5ac53e477b3b8fdfa644bf129da3aef74.zip
Merge pull request #1323 from jasjuang/tinyxml2
Update tinyxml2 to 5.0.0
-rw-r--r--ports/tinyxml2/CONTROL2
-rw-r--r--ports/tinyxml2/portfile.cmake24
2 files changed, 15 insertions, 11 deletions
diff --git a/ports/tinyxml2/CONTROL b/ports/tinyxml2/CONTROL
index b8bf3d76a..ee5e20f34 100644
--- a/ports/tinyxml2/CONTROL
+++ b/ports/tinyxml2/CONTROL
@@ -1,3 +1,3 @@
Source: tinyxml2
-Version: 3.0.0
+Version: 5.0.0
Description: A simple, small, efficient, C++ XML parser \ No newline at end of file
diff --git a/ports/tinyxml2/portfile.cmake b/ports/tinyxml2/portfile.cmake
index 656f4783f..59184178d 100644
--- a/ports/tinyxml2/portfile.cmake
+++ b/ports/tinyxml2/portfile.cmake
@@ -1,22 +1,26 @@
include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/tinyxml2-3.0.0)
-vcpkg_download_distfile(ARCHIVE
- URLS "https://github.com/leethomason/tinyxml2/archive/3.0.0.zip"
- FILENAME "tinyxml2-3.0.0.zip"
- SHA512 3581e086e41ea01418fdf74e53b932c41cada9a45b73fb71c15424672182dc2a1e55110f030962ae44df6f5d9f060478c5b04373f886da843a78fcabae8b063c
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO leethomason/tinyxml2
+ REF 5.0.0
+ SHA512 ef310a466d0aec9dd0d25063c68f5312cd063366ee57499d8e462e25a556ea510617b66cdec1a368e8867dc082e0297e27fe09f16eb915392235be34206881e4
+ HEAD_REF master
)
-vcpkg_extract_source_archive(${ARCHIVE})
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
- # OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1
- # OPTIONS_RELEASE -DOPTIMIZE=1
- # OPTIONS_DEBUG -DDEBUGGABLE=1
)
vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/tinyxml2")
+
+vcpkg_copy_pdbs()
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+
+# Handle copyright
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)
-vcpkg_copy_pdbs()