aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ports/tinyxml2/CONTROL2
-rw-r--r--ports/tinyxml2/portfile.cmake13
-rw-r--r--ports/tinyxml2/vcpkg-cmake-wrapper.cmake5
3 files changed, 3 insertions, 17 deletions
diff --git a/ports/tinyxml2/CONTROL b/ports/tinyxml2/CONTROL
index 185fa749c..5c4fb87a2 100644
--- a/ports/tinyxml2/CONTROL
+++ b/ports/tinyxml2/CONTROL
@@ -1,3 +1,3 @@
Source: tinyxml2
-Version: 6.2.0
+Version: 7.0.1
Description: A simple, small, efficient, C++ XML parser
diff --git a/ports/tinyxml2/portfile.cmake b/ports/tinyxml2/portfile.cmake
index 8a28b424b..d1e7d4ce6 100644
--- a/ports/tinyxml2/portfile.cmake
+++ b/ports/tinyxml2/portfile.cmake
@@ -3,21 +3,13 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO leethomason/tinyxml2
- REF 6.2.0
- SHA512 ef784240aeb090ab04aad659352ad4b224c431feecf485f33aca7936bcaa0ef4ab9d0a2e0692d3cf6036ac3e8012019d65665e780a920bbad3d4820f736445b1
+ REF 7.0.1
+ SHA512 623cd7eff542d20b434a67111ac98110101c95a18767318bf906e5e56d8cc25622269f740f50477fe907a4c52d875b614cb6167f4760d42ab18dc55b9d4bf380
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()
@@ -31,7 +23,6 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
file(COPY
${SOURCE_PATH}/readme.md
- ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake
DESTINATION ${CURRENT_PACKAGES_DIR}/share/tinyxml2
)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/tinyxml2/readme.md ${CURRENT_PACKAGES_DIR}/share/tinyxml2/copyright)
diff --git a/ports/tinyxml2/vcpkg-cmake-wrapper.cmake b/ports/tinyxml2/vcpkg-cmake-wrapper.cmake
deleted file mode 100644
index 867426f1e..000000000
--- a/ports/tinyxml2/vcpkg-cmake-wrapper.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-_find_package(${ARGS})
-if(TARGET tinyxml2_static AND NOT TARGET tinyxml2)
- _add_library(tinyxml2 INTERFACE IMPORTED)
- set_target_properties(tinyxml2 PROPERTIES INTERFACE_LINK_LIBRARIES "tinyxml2_static")
-endif()