aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ports/tinyxml/CONTROL2
-rw-r--r--ports/tinyxml/portfile.cmake17
2 files changed, 9 insertions, 10 deletions
diff --git a/ports/tinyxml/CONTROL b/ports/tinyxml/CONTROL
index 3d97a3312..f1075e38e 100644
--- a/ports/tinyxml/CONTROL
+++ b/ports/tinyxml/CONTROL
@@ -1,3 +1,3 @@
Source: tinyxml
-Version: 2.6.2-2
+Version: 2.6.2-3
Description: A simple, small, minimal, C++ XML parser that can be easily integrating into other programs.
diff --git a/ports/tinyxml/portfile.cmake b/ports/tinyxml/portfile.cmake
index dcd1fcc08..1d4e6131b 100644
--- a/ports/tinyxml/portfile.cmake
+++ b/ports/tinyxml/portfile.cmake
@@ -1,23 +1,22 @@
include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/tinyxml)
-
vcpkg_download_distfile(ARCHIVE
URLS "https://sourceforge.net/projects/tinyxml/files/tinyxml/2.6.2/tinyxml_2_6_2.tar.gz"
FILENAME "tinyxml_2_6_2.tar.gz"
SHA512 133b5db06131a90ad0c2b39b0063f1c8e65e67288a7e5d67e1f7d9ba32af10dc5dfa0462f9723985ee27debe8f09a10a25d4b5a5aaff2ede979b1cebe8e59d56
)
-vcpkg_extract_source_archive(${ARCHIVE})
-
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
-vcpkg_apply_patches(
- SOURCE_PATH ${SOURCE_PATH}
+vcpkg_extract_source_archive_ex(
+ OUT_SOURCE_PATH SOURCE_PATH
+ ARCHIVE ${ARCHIVE}
+ REF 2.6.2
PATCHES
- ${CMAKE_CURRENT_LIST_DIR}/0001_use_stl.patch
- ${CMAKE_CURRENT_LIST_DIR}/0002_export_tinyxml.patch
+ 0001_use_stl.patch
+ 0002_export_tinyxml.patch
)
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA