aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2018-02-13 16:43:42 -0800
committerAlexander Karatarakis <alkarata@microsoft.com>2018-02-13 16:43:55 -0800
commitd1e8095d634aa010a2974f23a90cca3ddc2f7fb5 (patch)
tree1fd30b513bd46fdd1534ba7e64f52d33fe834a67
parent78b1396b88f93f74f9a007599e5998026445f14f (diff)
downloadvcpkg-d1e8095d634aa010a2974f23a90cca3ddc2f7fb5.tar.gz
vcpkg-d1e8095d634aa010a2974f23a90cca3ddc2f7fb5.zip
[uriparser] Update to 0.8.5
-rw-r--r--ports/uriparser/CMakeLists.txt28
-rw-r--r--ports/uriparser/CONTROL2
-rw-r--r--ports/uriparser/portfile.cmake13
3 files changed, 11 insertions, 32 deletions
diff --git a/ports/uriparser/CMakeLists.txt b/ports/uriparser/CMakeLists.txt
index ec7f7bf38..47a6fbac1 100644
--- a/ports/uriparser/CMakeLists.txt
+++ b/ports/uriparser/CMakeLists.txt
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.8)
-project(uriparser C CXX)
+project(uriparser C)
if(MSVC)
add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS)
@@ -7,30 +7,9 @@ endif()
include_directories(include)
-set(SRC
- src/UriCommon.c
- src/UriCommon.h
- src/UriCompare.c
- src/UriEscape.c
- src/UriFile.c
- src/UriIp4.c
- src/UriIp4Base.c
- src/UriIp4Base.h
- src/UriNormalize.c
- src/UriNormalizeBase.c
- src/UriNormalizeBase.h
- src/UriParse.c
- src/UriParseBase.c
- src/UriParseBase.h
- src/UriQuery.c
- src/UriRecompose.c
- src/UriResolve.c
- src/UriShorten.c
-)
+file(GLOB SRC src/*.c)
-if(BUILD_SHARED_LIBS)
- set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-endif()
+set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
add_library(uriparser ${SRC})
@@ -41,7 +20,6 @@ install(
ARCHIVE DESTINATION lib
)
-
if(NOT DISABLE_INSTALL_HEADERS)
install(DIRECTORY include/ DESTINATION include)
endif()
diff --git a/ports/uriparser/CONTROL b/ports/uriparser/CONTROL
index 76f975dad..553d44de9 100644
--- a/ports/uriparser/CONTROL
+++ b/ports/uriparser/CONTROL
@@ -1,3 +1,3 @@
Source: uriparser
-Version: 0.8.4-1
+Version: 0.8.5
Description: uriparser is a strictly RFC 3986 compliant URI parsing and handling library written in C. uriparser is cross-platform, fast, supports Unicode
diff --git a/ports/uriparser/portfile.cmake b/ports/uriparser/portfile.cmake
index 040e3a9d7..cb8f1b14a 100644
--- a/ports/uriparser/portfile.cmake
+++ b/ports/uriparser/portfile.cmake
@@ -1,12 +1,13 @@
include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/uriparser-0.8.4)
-vcpkg_download_distfile(ARCHIVE
- URLS "https://sourceforge.net/projects/uriparser/files/Sources/0.8.4/uriparser-0.8.4.zip/download"
- FILENAME "uriparser-0.8.4.zip"
- SHA512 c22a98a027c4caa1d3559b1d3112f7ac567a489037d2b38f1999483f623a2e8d79fbacdc8859fe4e669a12f0f55935179f7be2f4424c61e51d1d68f6ced37185
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO uriparser/uriparser
+ REF uriparser-0.8.5
+ SHA512 b5a4eb316b96bdd5b87cac9fdd30b8988c158914e71030a45aafabd04df67a94bba9696782d98e9fa2169baf351e95ab1479bc76d8afe37968a941bc27a3ffb6
+ HEAD_REF master
)
-vcpkg_extract_source_archive(${ARCHIVE})
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})