[pull] master from microsoft:master

ports/ade/portfile.cmake

@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO opencv/ade
-    REF v0.1.1f
-    SHA512 fbdec8f3d5811a573abb81f1ceb6fb8d40274439013f749645db5430c6d9cdc52227c25203f1a68177b263d648bb65197ea7c2bea7871264a06585e59892631c
+    REF v0.1.2
+    SHA512 2761cf9ccb92d1df6f2d61964a64085470fff78b92d040fd8411d4c3a1f238b95eb4484a9624ab800e8fb4e5144eea32dee9a9047b9b67fad83d0856d32c91e9
     HEAD_REF master
 )
 

ports/ade/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "ade",
-  "version-string": "0.1.1f",
-  "port-version": 3,
+  "version": "0.1.2",
   "description": "ADE Framework is a graph construction, manipulation, and processing framework. ADE Framework is suitable for organizing data flow processing and execution.",
   "dependencies": [
     {

ports/angle/cmake-buildsystem/PlatformMac.cmake

@@ -1,8 +1,3 @@
-find_library(COREGRAPHICS_LIBRARY CoreGraphics)
-find_library(FOUNDATION_LIBRARY Foundation)
-find_library(IOKIT_LIBRARY IOKit)
-find_library(IOSURFACE_LIBRARY IOSurface)
-find_library(QUARTZ_LIBRARY Quartz)
 find_package(ZLIB REQUIRED)
 
 list(APPEND ANGLE_SOURCES
@@ -12,16 +7,15 @@ list(APPEND ANGLE_SOURCES
 )
 
 list(APPEND ANGLEGLESv2_LIBRARIES
-    ${COREGRAPHICS_LIBRARY}
-    ${FOUNDATION_LIBRARY}
-    ${IOKIT_LIBRARY}
-    ${IOSURFACE_LIBRARY}
-    ${QUARTZ_LIBRARY}
+    "-framework CoreGraphics"
+    "-framework Foundation"
+    "-framework IOKit"
+    "-framework IOSurface"
+    "-framework Quartz"
 )
 
 # Metal backend
 if(USE_METAL)
-    find_library(METAL_LIBRARY Metal)
     list(APPEND ANGLE_SOURCES
         ${_metal_backend_sources}
 
@@ -35,7 +29,7 @@ if(USE_METAL)
     )
 
     list(APPEND ANGLEGLESv2_LIBRARIES
-        ${METAL_LIBRARY}
+        "-framework Metal"
     )
 endif()
 

ports/angle/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "angle",
   "version-string": "chromium_5414",
-  "port-version": 6,
+  "port-version": 7,
   "description": [
     "A conformant OpenGL ES implementation for Windows, Mac and Linux.",
     "The goal of ANGLE is to allow users of multiple operating systems to seamlessly run WebGL and other OpenGL ES content by translating OpenGL ES API calls to one of the hardware-supported APIs available for that platform. ANGLE currently provides translation from OpenGL ES 2.0 and 3.0 to desktop OpenGL, OpenGL ES, Direct3D 9, and Direct3D 11. Support for translation from OpenGL ES to Vulkan is underway, and future plans include compute shader support (ES 3.1) and MacOS support."

ports/autodock-vina/CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_policy(VERSION 3.11)
 
 project(autodock-vina)
 
-set(GIT_VERSION v1.2.3)
+set(GIT_VERSION v1.2.5)
 set(CMAKE_CXX_STANDARD 11)
 
 find_package(Boost REQUIRED COMPONENTS

ports/autodock-vina/portfile.cmake

@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ccsb-scripps/AutoDock-Vina
-    REF v1.2.3
-    SHA512 ea3d3008553665af5fbafa3b4dfe379df257d9c5b957d81a91ec8b92f06a8d0f4c2dfc30b515a64c0bc6dcc70acedfdd498c3bb9a21cac58e43d4da37d2ff606
+    REF v${VERSION}
+    SHA512 d36908e5833d22bcbc4dae353ef32b905d6eb46511302f7583a291398bfadff5e75fc99ce7b380860578b2257e5c32434cc75b1ca51fafb4b5f12d9477a878e9
     HEAD_REF develop
 )
 

ports/autodock-vina/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "autodock-vina",
-  "version-semver": "1.2.3",
+  "version-semver": "1.2.5",
   "description": "AutoDock Vina is one of the fastest and most widely used open-source docking engines.",
   "homepage": "http://vina.scripps.edu/",
   "dependencies": [

ports/avro-cpp/fix-cmake.patch

@@ -0,0 +1,99 @@
+diff --git a/lang/c++/CMakeLists.txt b/lang/c++/CMakeLists.txt
+index 472684f4c..edde09e40 100644
+--- a/lang/c++/CMakeLists.txt
++++ b/lang/c++/CMakeLists.txt
+@@ -51,20 +51,16 @@ list(GET AVRO_VERSION 2 AVRO_VERSION_PATCH)
+ project (Avro-cpp)
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR})
+
++find_package(ZLIB REQUIRED)
++
+ if (WIN32 AND NOT CYGWIN AND NOT MSYS)
+     add_definitions (/EHa)
+-    add_definitions (
+-        -DNOMINMAX
+-        -DBOOST_REGEX_DYN_LINK
+-        -DBOOST_FILESYSTEM_DYN_LINK
+-        -DBOOST_SYSTEM_DYN_LINK
+-        -DBOOST_IOSTREAMS_DYN_LINK
+-        -DBOOST_PROGRAM_OPTIONS_DYN_LINK
+-        -DBOOST_ALL_NO_LIB)
++    add_definitions (-DNOMINMAX)
+ endif()
+
+ if (CMAKE_COMPILER_IS_GNUCXX)
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -Werror")
++    # Remove " -Werror" because of warning from boost-math (will require C++ 14 soon)
++    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic")
+ if (AVRO_ADD_PROTECTOR_FLAGS)
+     set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fstack-protector-all -D_GLIBCXX_DEBUG")
+     # Unset _GLIBCXX_DEBUG for avrogencpp.cc because using Boost Program Options
+@@ -114,7 +110,7 @@ set (AVRO_SOURCE_FILES
+         impl/CustomAttributes.cc
+         )
+
+-add_library (avrocpp SHARED ${AVRO_SOURCE_FILES})
++add_library (avrocpp ${AVRO_SOURCE_FILES})
+
+ set_property (TARGET avrocpp
+     APPEND PROPERTY COMPILE_DEFINITIONS AVRO_DYN_LINK)
+@@ -131,12 +127,12 @@ set_target_properties (avrocpp PROPERTIES
+ set_target_properties (avrocpp_s PROPERTIES
+     VERSION ${AVRO_VERSION_MAJOR}.${AVRO_VERSION_MINOR}.${AVRO_VERSION_PATCH})
+
+-target_link_libraries (avrocpp ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES})
++target_link_libraries (avrocpp ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES} ZLIB::ZLIB)
+ target_include_directories(avrocpp PRIVATE ${SNAPPY_INCLUDE_DIR})
+
+ add_executable (precompile test/precompile.cc)
+
+-target_link_libraries (precompile avrocpp_s ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES})
++target_link_libraries (precompile avrocpp_s ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES} ZLIB::ZLIB)
+
+ macro (gen file ns)
+     add_custom_command (OUTPUT ${file}.hh
+@@ -166,13 +162,14 @@ gen (primitivetypes pt)
+ gen (cpp_reserved_words cppres)
+
+ add_executable (avrogencpp impl/avrogencpp.cc)
+-target_link_libraries (avrogencpp avrocpp_s ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES})
++target_link_libraries (avrogencpp avrocpp_s ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES} ZLIB::ZLIB)
+
++if(BUILD_TESTING)
+ enable_testing()
+
+ macro (unittest name)
+-    add_executable (${name} test/${name}.cc)
+-    target_link_libraries (${name} avrocpp ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES})
++    add_executable (${name} test/${name}.cc impl/json/JsonIO.cc impl/json/JsonDom.cc)
++    target_link_libraries (${name} avrocpp ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES} ZLIB::ZLIB)
+     add_test (NAME ${name} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+         COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${name})
+ endmacro (unittest)
+@@ -197,6 +194,7 @@ add_dependencies (AvrogencppTests bigrecord_hh bigrecord_r_hh bigrecord2_hh
+     union_array_union_hh union_map_union_hh union_conflict_hh
+     recursive_hh reuse_hh circulardep_hh tree1_hh tree2_hh crossref_hh
+     primitivetypes_hh empty_record_hh)
++endif()
+
+ include (InstallRequiredSystemLibraries)
+
+@@ -204,10 +202,14 @@ set (CPACK_PACKAGE_FILE_NAME "avrocpp-${AVRO_VERSION_MAJOR}")
+
+ include (CPack)
+
+-install (TARGETS avrocpp avrocpp_s
+-    LIBRARY DESTINATION lib
+-    ARCHIVE DESTINATION lib
+-    RUNTIME DESTINATION lib)
++install(TARGETS avrocpp EXPORT unofficial-avro-cpp)
++
++install(
++    EXPORT unofficial-avro-cpp
++    FILE unofficial-avro-cpp-config.cmake
++    DESTINATION share/unofficial-avro-cpp
++    NAMESPACE unofficial::avro-cpp::
++)
+
+ install (TARGETS avrogencpp RUNTIME DESTINATION bin)
+

ports/avro-cpp/portfile.cmake

@@ -1,33 +1,49 @@
-vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO apache/avro
     REF e44b680621328c4e6524bd2983af1ce11afeebed
     SHA512 932f642f272997b5c0be467d3a3ccc354c6edf425c36b33aa7e61984f67312c712bb1d74cb1a5fd8066169104851e73830f0ed3fdb450e005a5c5bef33c34f20
     HEAD_REF master
     PATCHES
-        install.patch
+        fix-cmake.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    FEATURES
-        test               BUILD_TESTING
     INVERTED_FEATURES
         snappy             CMAKE_DISABLE_FIND_PACKAGE_Snappy
 )
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}/lang/c++"
     OPTIONS
+        -DBUILD_TESTING=OFF
         ${FEATURE_OPTIONS}
 )
 
-vcpkg_cmake_install(ADD_BIN_TO_PATH)
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT})
+
+file(READ "${CURRENT_PACKAGES_DIR}/share/unofficial-avro-cpp/unofficial-avro-cpp-config.cmake" cmake_config)
+if("snappy" IN_LIST FEATURES)
+    file(WRITE "${CURRENT_PACKAGES_DIR}/share/unofficial-avro-cpp/unofficial-avro-cpp-config.cmake"
+"include(CMakeFindDependencyMacro)
+find_dependency(ZLIB)
+find_dependency(Snappy)
+${cmake_config}
+")
+else()
+    file(WRITE "${CURRENT_PACKAGES_DIR}/share/unofficial-avro-cpp/unofficial-avro-cpp-config.cmake"
+"include(CMakeFindDependencyMacro)
+find_dependency(ZLIB)
+${cmake_config}
+")
+endif()
 
 vcpkg_copy_pdbs()
+vcpkg_copy_tools(TOOL_NAMES avrogencpp AUTO_CLEAN)
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
-file(INSTALL "${SOURCE_PATH}/lang/c++/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/lang/c++/LICENSE")
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")

ports/avro-cpp/usage

@@ -1,9 +1,4 @@
-The package avro-cpp can be used from CMake via:
+avro-cpp provides CMake targets:
 
-    find_path(AVROCPP_INCLUDE_DIR avro/Encoder.hh)
-    find_library(AVROCPP_LIBRARY_DEBUG avrocpp PATH_SUFFIXES "debug/lib" REQUIRED)
-    get_filename_component(AVROCPP_ROOT_FIND_DIR ${AVROCPP_INCLUDE_DIR} DIRECTORY)
-    find_library(AVROCPP_LIBRARY_RELEASE avrocpp PATHS "${AVROCPP_ROOT_FIND_DIR}/lib/" REQUIRED NO_DEFAULT_PATH)
-
-    target_include_directories(main PRIVATE "${AVROCPP_INCLUDE_DIR}")
-    target_link_libraries(main PRIVATE optimized "${AVROCPP_LIBRARY_RELEASE}" debug "${AVROCPP_LIBRARY_DEBUG}")
+    find_package(unofficial-avro-cpp CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE unofficial::avro-cpp::avrocpp)