Merge branch 'master' into master

2025-06-07 01:24:47 +08:00 · 2017-10-23 12:15:01 -07:00 · 2017-10-23 12:15:01 -07:00 · 65fa778cf6
commit 65fa778cf6
parent f24c1c6ccd 0b6e08b148
16 changed files with 48 additions and 174 deletions
--- a/docs/about/faq.md
+++ b/docs/about/faq.md
@ -78,7 +78,7 @@ Vcpkg uses CMake internally as a build scripting language. This is because CMake
 ## Will Vcpkg support downloading compiled binaries from a public or private server?
 We would like to eventually support downloading precompiled binaries, similar to other system package managers.

-In a corporate scenario, we currently recommend building the libraries once and distributing the entire vcpkg root directory to everyone else on the project through some raw file transport such as a network share or HTTP host. See [the `export` command](../users/integration.md#export).
+In a corporate scenario, we currently recommend building the libraries once and distributing the entire vcpkg root directory to everyone else on the project through some raw file transport such as a network share or HTTP host. See the [`export`](../users/integration.md#export) command.

 ## What Visual C++ toolsets are supported?
 We support Visual Studio 2015 Update 3 and above.
--- a/ports/cpprestsdk/0001_cmake.patch
+++ b/ports/cpprestsdk/0001_cmake.patch
@ -1,96 +0,0 @@
-diff --git a/Release/CMakeLists.txt b/Release/CMakeLists.txt
-index 1274102..fe245e6 100644
--- a/Release/CMakeLists.txt
-+++ b/Release/CMakeLists.txt
-@@ -89,15 +89,6 @@ elseif(UNIX) # This includes OSX
- 
-   option(BUILD_SHARED_LIBS "Build shared Libraries." ON)
-   option(BUILD_SAMPLES "Build samples." ON)
-  option(CASA_INSTALL_HEADERS "Install header files." ON)
-  if(CASA_INSTALL_HEADERS)
-    file(GLOB CASA_HEADERS_CPPREST include/cpprest/*.hpp include/cpprest/*.h include/cpprest/*.dat)
-    install(FILES ${CASA_HEADERS_CPPREST} DESTINATION include/cpprest)
-    file(GLOB CASA_HEADERS_PPLX include/pplx/*.hpp include/pplx/*.h)
-    install(FILES ${CASA_HEADERS_PPLX} DESTINATION include/pplx)
-    file(GLOB CASA_HEADERS_DETAILS include/cpprest/details/*.hpp include/cpprest/details/*.h include/cpprest/details/*.dat)
-    install(FILES ${CASA_HEADERS_DETAILS} DESTINATION include/cpprest/details)
-  endif()
- elseif(WIN32)
-   option(BUILD_SHARED_LIBS "Build shared Libraries." ON)
-   option(BUILD_SAMPLES "Build samples." ON)
-@@ -113,37 +104,25 @@ elseif(WIN32)
-     set(Casablanca_DEFINITIONS "" CACHE INTERNAL "Definitions for consume casablanca library")
-   endif()
-   add_definitions(${Casablanca_DEFINITIONS} -D_WINSOCK_DEPRECATED_NO_WARNINGS -DWIN32)
-
-  if (NOT CPPREST_EXCLUDE_WEBSOCKETS)
-    set(NUGET_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../packages")
-    set(PACKAGE_PATHS)
-    list(APPEND PACKAGE_PATHS "${NUGET_PATH}/boost.1.58.0.0/")
-    list(APPEND PACKAGE_PATHS "${NUGET_PATH}/boost_system-vc140.1.58.0-vs140rc/")
-    list(APPEND PACKAGE_PATHS "${NUGET_PATH}/boost_date_time-vc140.1.58.0-vs140rc/")
-    list(APPEND PACKAGE_PATHS "${NUGET_PATH}/boost_regex-vc140.1.58.0-vs140rc/")
-    list(APPEND PACKAGE_PATHS "${NUGET_PATH}/openssl.v140.windesktop.msvcstl.static.rt-dyn.x64.1.0.2.1/")
-    list(APPEND PACKAGE_PATHS "${NUGET_PATH}/zlib.v140.windesktop.msvcstl.static.rt-dyn.1.2.8.8/")
-
-    if (NOT WINDOWS_STORE AND NOT WINDOWS_PHONE)
-      find_library(Boost_SYSTEM_LIBRARY libboost_system-vc140-mt-gd-1_58.lib PATHS ${PACKAGE_PATHS} PATH_SUFFIXES lib/native/address-model-64/lib)
-      find_library(Boost_DATE_TIME_LIBRARY libboost_date_time-vc140-mt-gd-1_58.lib PATHS ${PACKAGE_PATHS} PATH_SUFFIXES lib/native/address-model-64/lib)
-      find_library(Boost_REGEX_LIBRARY libboost_regex-vc140-mt-gd-1_58.lib PATHS ${PACKAGE_PATHS} PATH_SUFFIXES lib/native/address-model-64/lib)
-      set(Boost_LIBRARIES ${Boost_REGEX_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_DATE_TIME_LIBRARY})
-  
-      find_library(OpenSSL_libeay_LIBRARY libeay32.lib PATHS ${PACKAGE_PATHS} PATH_SUFFIXES lib/native/v140/windesktop/msvcstl/static/rt-dyn/x64/debug)
-      find_library(OpenSSL_ssleay_LIBRARY ssleay32.lib PATHS ${PACKAGE_PATHS} PATH_SUFFIXES lib/native/v140/windesktop/msvcstl/static/rt-dyn/x64/debug)
-      find_library(ZLIB_LIBRARY zlibstaticd.lib PATHS ${PACKAGE_PATHS} PATH_SUFFIXES lib/native/v140/windesktop/msvcstl/static/rt-dyn/x64/debug)
-      set(OPENSSL_LIBRARIES ${OpenSSL_ssleay_LIBRARY} ${OpenSSL_libeay_LIBRARY} ${ZLIB_LIBRARY})
-
-      set(OPENSSL_INCLUDE_DIR "${NUGET_PATH}/openssl.v140.windesktop.msvcstl.static.rt-dyn.x64.1.0.2.1/build/native/include")
-    endif()
-
-    set(Boost_INCLUDE_DIR "${NUGET_PATH}/boost.1.58.0.0/lib/native/include")
-  endif()
-+  if (NOT CPPREST_EXCLUDE_WEBSOCKETS AND NOT WINDOWS_STORE)
-+    find_package(ZLIB REQUIRED)
-+    find_package(OpenSSL REQUIRED)
-+    find_package(Boost REQUIRED COMPONENTS regex system date_time)
-+   endif()
- else()
-   message(FATAL_ERROR "-- Unsupported Build Platform.")
- endif()
- 
-+option(CASA_INSTALL_HEADERS "Install header files." ON)
-+if(CASA_INSTALL_HEADERS)
-+  file(GLOB CASA_HEADERS_CPPREST include/cpprest/*.hpp include/cpprest/*.h include/cpprest/*.dat)
-+  install(FILES ${CASA_HEADERS_CPPREST} DESTINATION include/cpprest)
-+  file(GLOB CASA_HEADERS_PPLX include/pplx/*.hpp include/pplx/*.h)
-+  install(FILES ${CASA_HEADERS_PPLX} DESTINATION include/pplx)
-+  file(GLOB CASA_HEADERS_DETAILS include/cpprest/details/*.hpp include/cpprest/details/*.h include/cpprest/details/*.dat)
-+  install(FILES ${CASA_HEADERS_DETAILS} DESTINATION include/cpprest/details)
-+endif()
-+
- # Compiler (not platform) specific settings
- if(ANDROID)
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-strict-aliasing")
-diff --git a/Release/src/CMakeLists.txt b/Release/src/CMakeLists.txt
-index 4074905..da907e5 100644
--- a/Release/src/CMakeLists.txt
-+++ b/Release/src/CMakeLists.txt
-@@ -144,10 +144,11 @@ elseif(ANDROID)
- else()
-   set_target_properties(cpprest PROPERTIES
-     SOVERSION ${CPPREST_VERSION_MAJOR}.${CPPREST_VERSION_MINOR})
-
-  install(
-    TARGETS cpprest
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib
-    )
- endif()
-+
-+install(
-+  TARGETS cpprest
-+  RUNTIME DESTINATION bin
-+  LIBRARY DESTINATION lib
-+  ARCHIVE DESTINATION lib
-+  )
-\ No newline at end of file
--- a/ports/cpprestsdk/0002_no_websocketpp_in_uwp.patch
+++ b/ports/cpprestsdk/0002_no_websocketpp_in_uwp.patch
@ -1,13 +0,0 @@
-diff --git a/release/CMakeLists.txt b/release/CMakeLists.txt
-index fe245e6..94a5c57 100644
--- a/release/CMakeLists.txt
-+++ b/release/CMakeLists.txt
-@@ -177,7 +177,7 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/Binaries)
- 
- # These settings can be used by the test targets
- set(Casablanca_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include)
-if (NOT CPPREST_EXCLUDE_WEBSOCKETS)
-+if (NOT CPPREST_EXCLUDE_WEBSOCKETS AND NOT WINDOWS_STORE AND NOT WINDOWS_PHONE)
-   find_path(WEBSOCKETPP_CONFIG websocketpp-config.cmake
-                         HINTS /usr/lib/cmake/websocketpp)
-   find_path(WEBSOCKETPP_CONFIG_VERSION websocketpp-configVersion.cmake
--- a/ports/cpprestsdk/0003_openssl_110.patch
+++ b/ports/cpprestsdk/0003_openssl_110.patch
@ -1,14 +0,0 @@
-diff --git a/Release/src/websockets/client/ws_client_wspp.cpp b/Release/src/websockets/client/ws_client_wspp.cpp
-index 9f91d68..4b5d506 100644
--- a/Release/src/websockets/client/ws_client_wspp.cpp
-+++ b/Release/src/websockets/client/ws_client_wspp.cpp
-@@ -76,7 +76,9 @@ static struct ASIO_SSL_memory_leak_suppress
- {
-     ~ASIO_SSL_memory_leak_suppress()
-     {
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-         ::SSL_COMP_free_compression_methods();
-+#endif
-     }
- } ASIO_SSL_memory_leak_suppressor;
- 
--- a/ports/cpprestsdk/CONTROL
+++ b/ports/cpprestsdk/CONTROL
@ -1,5 +1,5 @@
 Source: cpprestsdk
-Version: 2.9.0-4
-Build-Depends: zlib (windows), openssl (windows), boost (windows), websocketpp (windows)
+Version: 2.10.0
+Build-Depends: zlib, openssl (windows), boost (windows), websocketpp (windows)
 Description: C++11 JSON, REST, and OAuth library
  The C++ REST SDK is a Microsoft project for cloud-based client-server communication in native code using a modern asynchronous C++ API design. This project aims to help C++ developers connect to and interact with services.
--- a/ports/cpprestsdk/portfile.cmake
+++ b/ports/cpprestsdk/portfile.cmake
@ -3,19 +3,10 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO Microsoft/cpprestsdk
-    REF v2.9.0
-    SHA512 7f6af05e2aaf49fb5ba24f4fac43b7787345d46913831504925cefc60d1b62e38457e1d628d5de8b0db891b59716d2bfe63a494ca0b337d67fc9ca5447a5ba9b
+    REF v2.10.0
+    SHA512 78e7a38c21db5b563d08cb082bfa96360ac44c66f2189a614d3d2bb71655fd82d931f138590d2dba2d6a4c0884ae37a5be34ea3b753c3517bd68ce490daf60b4
    HEAD_REF master
 )
-if(NOT VCPKG_USE_HEAD_VERSION)
-    vcpkg_apply_patches(
-        SOURCE_PATH ${SOURCE_PATH}
-        PATCHES
-            ${CMAKE_CURRENT_LIST_DIR}/0001_cmake.patch
-            ${CMAKE_CURRENT_LIST_DIR}/0002_no_websocketpp_in_uwp.patch
-            ${CMAKE_CURRENT_LIST_DIR}/0003_openssl_110.patch
-    )
-endif()

 set(OPTIONS)
 if(NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
@ -35,15 +26,12 @@ vcpkg_configure_cmake(
        -DCPPREST_EXCLUDE_WEBSOCKETS=OFF
        -DCPPREST_EXPORT_DIR=share/cpprestsdk
    OPTIONS_DEBUG
-        -DCASA_INSTALL_HEADERS=OFF
        -DCPPREST_INSTALL_HEADERS=OFF
 )

 vcpkg_install_cmake()

-if(VCPKG_USE_HEAD_VERSION)
-    vcpkg_fixup_cmake_targets()
-endif()
+vcpkg_fixup_cmake_targets()

 file(INSTALL
    ${SOURCE_PATH}/license.txt
--- a/ports/cppwinrt/CONTROL
+++ b/ports/cppwinrt/CONTROL
@ -1,3 +1,3 @@
 Source: cppwinrt
-Version: Fall_2017_Creators_Update_for_VS_15.3
+Version: fall_2017_creators_update_for_vs_15.3-2
 Description: C++/WinRT is a standard C++ language projection for the Windows Runtime.
--- a/ports/cppwinrt/portfile.cmake
+++ b/ports/cppwinrt/portfile.cmake
@ -1,13 +1,12 @@
 include(vcpkg_common_functions)

-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/cppwinrt-fall_2017_creators_update_for_vs_15.3)
-
-vcpkg_download_distfile(ARCHIVE
-	URLS "https://github.com/Microsoft/cppwinrt/archive/fall_2017_creators_update_for_vs_15.3.tar.gz"
-    FILENAME "cppwinrt-fall_2017_creators_update_for_vs_15.3.tar.gz"
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO Microsoft/cppwinrt
+    REF fall_2017_creators_update_for_vs_15.3
    SHA512 e3f987ed3f3dce019b8bf9f5451e53b42357473a003b8c14f9009e1848ee0463286bd46fdc3c739c8f7c2d232707e8018f5c087ffae784c745d51a8143f9a294
+    HEAD_REF master
 )
-vcpkg_extract_source_archive(${ARCHIVE})

 # Put the licence file where vcpkg expects it
 file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/cppwinrt)
--- a/ports/cppzmq/CONTROL
+++ b/ports/cppzmq/CONTROL
@ -1,4 +1,4 @@
 Source: cppzmq
-Version: 4.2.1
+Version: 4.2.2
 Build-Depends: zeromq
 Description: lightweight messaging kernel, C++ bindings
--- a/ports/cppzmq/portfile.cmake
+++ b/ports/cppzmq/portfile.cmake
@ -1,12 +1,13 @@
 #header-only library
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/cppzmq-4.2.1)
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/zeromq/cppzmq/archive/v4.2.1.zip"
-    FILENAME "cppzmq-4.2.1.zip"
-    SHA512 ee75ce4bd28ecb5ef660d1ed6f5522654eced6ded8745dc0c61df351f4ff0ff8980d1bd848b2649fcce4aa539a457e56e55b0a59cb49f44b0a29875d0ea28dce
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO zeromq/cppzmq
+    REF v4.2.2
+    SHA512 5f61ea4a16987c1363c3029cf46b3e83ddd86d65e8d639b0332d691f8fdb5cee121b5d72a9b8c89221daf52ea5892219e0bc4ea4e761bb1e7deb1659011dd3c9
+    HEAD_REF master
 )
-vcpkg_extract_source_archive(${ARCHIVE})

 # cppzmq is a single header library, so we just need to copy that file in the include directory
 file(INSTALL ${SOURCE_PATH}/zmq.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include)
--- a/ports/libmariadb/CONTROL
+++ b/ports/libmariadb/CONTROL
@ -1,3 +1,3 @@
 Source: libmariadb
-Version: 2.3.2-1
+Version: 3.0.2
 Description: MariaDB Connector/C is used to connect C/C++ applications to MariaDB and MySQL databases
--- a/ports/libmariadb/portfile.cmake
+++ b/ports/libmariadb/portfile.cmake
@ -4,17 +4,21 @@ if (EXISTS "${CURRENT_INSTALLED_DIR}/include/mysql/mysql.h")
 endif()

 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mariadb-connector-c-2.3.2)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mariadb-connector-c-3.0.2)

 vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/MariaDB/mariadb-connector-c/archive/v2.3.2.tar.gz"
-    FILENAME "mariadb-connector-c-2.3.2.tar.gz"
-    SHA512 f5574756ffce69e3dd15b7f7c14cfd0b4d69e3203ae4b383f05a110918916279ba7c0b9149d0dcb9ec93bbfc0927dfaf88bb40979ba1de710ce148d1fbe033af
+    URLS "https://github.com/MariaDB/mariadb-connector-c/archive/v3.0.2.tar.gz"
+    FILENAME "mariadb-connector-c-3.0.2.tar.gz"
+    SHA512 a5086ff149b1ca0e1b652013475c5f3793824416a60ec35018b6dcd502bd38b50fa040271ff8d308520dadecc9601671fccf67046fcda2425f1d7c59e1c6c52f
 )
 vcpkg_extract_source_archive(${ARCHIVE})

 vcpkg_configure_cmake(
    SOURCE_PATH ${SOURCE_PATH}
+	OPTIONS
+		-DWITH_UNITTEST=OFF
+		-DWITH_SSL=OFF
+		-DWITH_CURL=OFF
 )

 vcpkg_install_cmake()
--- a/ports/pugixml/CONTROL
+++ b/ports/pugixml/CONTROL
@ -1,3 +1,3 @@
 Source: pugixml
-Version: 1.8.1-1
+Version: 1.8.1-2
 Description: C++ XML processing library
--- a/ports/pugixml/portfile.cmake
+++ b/ports/pugixml/portfile.cmake
@ -7,17 +7,22 @@ vcpkg_download_distfile(ARCHIVE
 )
 vcpkg_extract_source_archive(${ARCHIVE})

-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/pugixmlapi.patch
-)
-
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-	OPTIONS
-        -DBUILD_DEFINES="PUGIXML_API=__declspec\(dllexport\)"
-)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+	vcpkg_configure_cmake(
+		SOURCE_PATH ${SOURCE_PATH}
+	)
+else()
+	vcpkg_apply_patches(
+		SOURCE_PATH ${SOURCE_PATH}
+		PATCHES
+			${CMAKE_CURRENT_LIST_DIR}/pugixmlapi.patch
+	)
+	vcpkg_configure_cmake(
+		SOURCE_PATH ${SOURCE_PATH}
+		OPTIONS
+			-DBUILD_DEFINES="PUGIXML_API=__declspec\(dllexport\)"
+	)
+endif()

 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
--- a/ports/smpeg2/CMakeLists.txt
+++ b/ports/smpeg2/CMakeLists.txt
@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.6)
 project(SMPEG2 CXX)

 find_path(SDL_INCLUDE_DIR SDL2/SDL.h)
-find_library(SDL_LIBRARY SDL2)
+find_library(SDL_LIBRARY NAMES SDL2d SDL2)

 include_directories(${SDL_INCLUDE_DIR})
 include_directories(${SDL_INCLUDE_DIR}/SDL2)
--- a/ports/smpeg2/CONTROL
+++ b/ports/smpeg2/CONTROL
@ -1,4 +1,4 @@
 Source: smpeg2
-Version: 2.0.0-2
+Version: 2.0.0-3
 Description: SDL MPEG Player Library
 Build-Depends: sdl2