aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjasjuang <jasjuang@gmail.com>2017-06-20 15:41:50 -0700
committerjasjuang <jasjuang@gmail.com>2017-06-20 15:41:50 -0700
commitd387490dc8e349741433ccff0d735cb31d088b78 (patch)
tree8d7add950b0a099c2fba1b22fef8fa50640f3144
parentf53585bedd94acab307f0543f4617dea0f987d1d (diff)
downloadvcpkg-d387490dc8e349741433ccff0d735cb31d088b78.tar.gz
vcpkg-d387490dc8e349741433ccff0d735cb31d088b78.zip
update control file and cleanup portfile
-rw-r--r--ports/tinyxml2/CONTROL2
-rw-r--r--ports/tinyxml2/portfile.cmake21
2 files changed, 1 insertions, 22 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 afdbae878..59184178d 100644
--- a/ports/tinyxml2/portfile.cmake
+++ b/ports/tinyxml2/portfile.cmake
@@ -1,15 +1,3 @@
-# Common Ambient Variables:
-# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
-# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
-# CURRENT_PORT DIR = ${VCPKG_ROOT_DIR}\ports\${PORT}
-# PORT = current port name (zlib, etc)
-# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc)
-# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic)
-# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic)
-# VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg>
-# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm)
-#
-
include(vcpkg_common_functions)
vcpkg_from_github(
@@ -22,21 +10,12 @@ vcpkg_from_github(
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")
-# changes target search path
-file(READ ${CURRENT_PACKAGES_DIR}/share/tinyxml2/tinyxml2Targets.cmake TINYXML2_TARGETS)
-string(REPLACE "get_filename_component(_IMPORT_PREFIX \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)\nget_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)"
- "get_filename_component(_IMPORT_PREFIX \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)" TINYXML2_TARGETS ${TINYXML2_TARGETS})
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/tinyxml2/tinyxml2Targets.cmake "${TINYXML2_TARGETS}")
-
vcpkg_copy_pdbs()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)