Merge branch 'master' of https://github.com/Microsoft/vcpkg into add_libraqm

ports/benchmark/portfile.cmake

@@ -9,8 +9,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/benchmark
-    REF v1.5
-    SHA512 a57122340c4f9a8e434ec70098916aef7c49d5d8312a30e4753f54bacc1099b146698b66c12f9ef116f7cadc93c604809a905c0e259aecf63aa2553390a1b609
+    REF v1.5.0
+    SHA512 a0df9aa3d03f676e302c76d83b436de36eea0a8517ab50a8f5a11c74ccc68a1f5128fa02474901002d8e6b5a4d290ef0272a798ff4670eab3e2d78dc86bb6cd3
     HEAD_REF master
 )
 

ports/cjson/CONTROL

@@ -0,0 +1,6 @@
+Source: cjson
+Version: 1.7.10-1
+Description: Ultralightweight JSON parser in ANSI C
+
+Feature: utils
+Description: Enable building the cJSON_Utils library

ports/cjson/fix-install-path.patch

@@ -0,0 +1,34 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 033a882..6e2b2e4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -149,7 +149,13 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/library_config/libcjson.pc.in"
+ 
+ install(FILES cJSON.h DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/cjson")
+ install (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcjson.pc" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig")
+-install(TARGETS "${CJSON_LIB}" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" EXPORT "${CJSON_LIB}")
++install(TARGETS "${CJSON_LIB}"
++    EXPORT "${CJSON_LIB}"
++    ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
++    LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
++    RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}"
++    INCLUDES DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}"
++)
+ if (BUILD_SHARED_AND_STATIC_LIBS)
+     install(TARGETS "${CJSON_LIB}-static" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}")
+ endif()
+@@ -186,7 +192,13 @@ if(ENABLE_CJSON_UTILS)
+     configure_file("${CMAKE_CURRENT_SOURCE_DIR}/library_config/libcjson_utils.pc.in"
+         "${CMAKE_CURRENT_BINARY_DIR}/libcjson_utils.pc" @ONLY)
+ 
+-    install(TARGETS "${CJSON_UTILS_LIB}" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" EXPORT "${CJSON_UTILS_LIB}")
++    install(TARGETS "${CJSON_UTILS_LIB}"
++        EXPORT "${CJSON_UTILS_LIB}"
++        ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
++        LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
++        RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}"
++        INCLUDES DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}"
++    )
+     if (BUILD_SHARED_AND_STATIC_LIBS)
+         install(TARGETS "${CJSON_UTILS_LIB}-static" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}")
+     endif()

ports/cjson/portfile.cmake

@@ -0,0 +1,63 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO DaveGamble/cJSON
+    REF v1.7.10
+    SHA512 f8d7c9fe798b51ec3c69cabe4124d2f6372f0e6d282285e3ca951c58c971a9a520d87550530d750ff7f8055c0b6ff566f237b9af9eb345cf4f4fc4ff8c910740
+    HEAD_REF master
+    PATCHES
+        fix-install-path.patch
+)
+
+if("utils" IN_LIST FEATURES)
+    set(ENABLE_CJSON_UTILS ON)
+else()
+    set(ENABLE_CJSON_UTILS OFF)
+endif()
+
+if(CMAKE_HOST_WIN32)
+    string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ENABLE_PUBLIC_SYMBOLS)
+else()
+    set(ENABLE_PUBLIC_SYMBOLS OFF)
+endif()
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DBUILD_SHARED_AND_STATIC_LIBS=OFF
+        -DCJSON_OVERRIDE_BUILD_SHARED_LIBS=OFF
+        -DENABLE_PUBLIC_SYMBOLS=${ENABLE_PUBLIC_SYMBOLS}
+        -DENABLE_TARGET_EXPORT=ON # Export CMake config files
+        -DENABLE_CJSON_UTILS=${ENABLE_CJSON_UTILS}
+        -DENABLE_CJSON_TEST=OFF
+        -DENABLE_FUZZING=OFF
+)
+
+vcpkg_install_cmake()
+
+vcpkg_copy_pdbs()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/cJSON)
+
+file(REMOVE_RECURSE
+    ${CURRENT_PACKAGES_DIR}/debug/include
+    ${CURRENT_PACKAGES_DIR}/debug/share
+)
+
+file(READ ${CURRENT_PACKAGES_DIR}/include/cjson/cJSON.h _contents)
+if(ENABLE_PUBLIC_SYMBOLS)
+    string(REPLACE "defined(CJSON_HIDE_SYMBOLS)" "0 /* defined(CJSON_HIDE_SYMBOLS) */" _contents "${_contents}")
+    string(REPLACE "defined(CJSON_EXPORT_SYMBOLS)" "0 /* defined(CJSON_EXPORT_SYMBOLS) */" _contents "${_contents}")
+    string(REPLACE "defined(CJSON_IMPORT_SYMBOLS)" "1 /* defined(CJSON_IMPORT_SYMBOLS) */" _contents "${_contents}")
+else()
+    string(REPLACE "defined(CJSON_HIDE_SYMBOLS)" "1 /* defined(CJSON_HIDE_SYMBOLS) */" _contents "${_contents}")
+endif()
+file(WRITE ${CURRENT_PACKAGES_DIR}/include/cjson/cJSON.h "${_contents}")
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
+
+# CMake integration test
+vcpkg_test_cmake(PACKAGE_NAME ${PORT})

ports/gtk/CMakeLists.txt

@@ -12,6 +12,11 @@ if(CMAKE_BUILD_TYPE STREQUAL Debug)
     set(CAIRO_LIB_SUFFIX d)
 endif()
 
+if (WIN32)
+  # Set utf-8 charset to avoid compile error C2001
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /utf-8")
+endif()
+
 # find dependencies
 # glib
 find_path(GLIB_INCLUDE_DIR glib.h)

ports/gtk/CONTROL

@@ -1,4 +1,4 @@
 Source: gtk
-Version: 3.22.19-2
+Version: 3.22.19-3
 Description: Portable library for creating graphical user interfaces.
 Build-Depends: glib, atk, gdk-pixbuf, pango, cairo, libepoxy, gettext

ports/pango/CMakeLists.txt

@@ -11,6 +11,11 @@ else()
   configure_file(./config.h.unix ${CMAKE_CURRENT_BINARY_DIR}/config.h COPYONLY)
 endif()
 
+if (WIN32)
+  # Set utf-8 charset to avoid compile error C2001
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /utf-8")
+endif()
+
 add_definitions(-DHAVE_CONFIG_H)
 include_directories(. ./pango ${CMAKE_CURRENT_BINARY_DIR})
 

ports/pango/CONTROL

@@ -1,4 +1,4 @@
 Source: pango
-Version: 1.40.11-3
+Version: 1.40.11-4
 Description: Text and font handling library.
 Build-Depends: glib, gettext, cairo, fontconfig, freetype, harfbuzz[glib] (!windows-static)

ports/restinio/CONTROL

@@ -1,4 +1,4 @@
 Source: restinio
-Version: 0.4.9
+Version: 0.4.9.1
 Description: A header-only C++14 library that gives you an embedded HTTP/Websocket server targeted primarily for asynchronous processing of HTTP-requests.
 Build-Depends: asio, fmt, http-parser

ports/restinio/portfile.cmake

@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_bitbucket(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO sobjectizerteam/restinio-0.4
-    REF v.0.4.9
-    SHA512 a839d3178d89e954bd47a40c7468e1ab2b34786c0122897620d9d8cff36e9d2c50b5e93d0774f7bdba8a17f91ea7dc2730135a6cdcb76aad5d8f5079ee1d9fdd
+    REF v.0.4.9.1
+    SHA512 e1bd27c08331b2994ce1be140502c9d7166cc997fd79f4380ea3400106f11a2cad25c72b9d0a0b2bf11c15ce9f895522e7aea41a5f2620e30752eded78869a62
 )
 
 vcpkg_configure_cmake(