microsoft · BillyONeal · Apr 28, 2022 · Jan 27, 2022 · Jan 31, 2022 · Jan 31, 2022
diff --git a/ports/boost-modular-build-helper/CMakeLists.txt b/ports/boost-modular-build-helper/CMakeLists.txt
@@ -96,10 +96,7 @@ if(VCPKG_DETECTED_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
     list(TRANSFORM libpath_args PREPEND "/AI\"")
     list(TRANSFORM libpath_args APPEND "\"")
     list(JOIN libpath_args " " libpath_arg)
-
-    string(APPEND CXXFLAGS " /ZW")
     string(APPEND COMPILEFLAGS " ${libpath_arg} /D_WIN32_WINNT=0x0A00")
-    string(APPEND CFLAGS " -Zl")
     list(APPEND B2_OPTIONS windows-api=store)
     list(APPEND B2_OPTIONS linkflags=WindowsApp.lib)
 endif()

diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "boost-modular-build-helper",
   "version": "1.79.0",
+  "port-version": 1,
   "description": "Internal vcpkg port used to build Boost libraries",
   "license": "MIT",
   "dependencies": [

diff --git a/ports/cpprestsdk/portfile.cmake b/ports/cpprestsdk/portfile.cmake
@@ -23,9 +23,13 @@ vcpkg_check_features(
       websockets CPPREST_EXCLUDE_WEBSOCKETS
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}/Release
-    PREFER_NINJA
+if(VCPKG_TARGET_IS_UWP)
+    set(configure_opts WINDOWS_USE_MSBUILD)
+endif()
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}/Release"
+    ${configure_opts}
     OPTIONS
         ${OPTIONS}
         ${FEATURE_OPTIONS}
@@ -38,16 +42,16 @@ vcpkg_configure_cmake(
         -DCPPREST_INSTALL_HEADERS=OFF
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
 vcpkg_copy_pdbs()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/share/${PORT})
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/share ${CURRENT_PACKAGES_DIR}/lib/share)
+vcpkg_cmake_config_fixup(CONFIG_PATH "lib/share/${PORT}")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/share" "${CURRENT_PACKAGES_DIR}/lib/share")
 
 if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/cpprest/details/cpprest_compat.h
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/cpprest/details/cpprest_compat.h"
         "#ifdef _NO_ASYNCRTIMP" "#if 1")
 endif()
 
-file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/cpprestsdk/vcpkg.json b/ports/cpprestsdk/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "cpprestsdk",
-  "version-string": "2.10.18",
+  "version": "2.10.18",
+  "port-version": 1,
   "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."
@@ -42,6 +43,14 @@
     {
       "name": "openssl",
       "platform": "!uwp & !windows"
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
     }
   ],
   "default-features": [

diff --git a/ports/igraph/vcpkg.json b/ports/igraph/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "igraph",
   "version": "0.9.8",
-  "port-version": 1,
+  "port-version": 2,
   "description": "igraph is a C library for network analysis and graph theory, with an emphasis on efficiency portability and ease of use.",
   "homepage": "https://igraph.org/",
   "license": "GPL-2.0-or-later",
+  "supports": "!uwp",
   "dependencies": [
     "blas",
     "lapack",

diff --git a/ports/libcerf/portfile.cmake b/ports/libcerf/portfile.cmake
@@ -16,18 +16,22 @@ vcpkg_extract_source_archive_ex(
     PATCHES 001-fix-static-build.patch
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+if(VCPKG_TARGET_IS_UWP)
+    set(configure_opts WINDOWS_USE_MSBUILD)
+endif()
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    ${configure_opts}
     OPTIONS
         -DCERF_CPP=ON
         -DLIB_MAN=OFF
         -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libcerf RENAME copyright)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libcerf" RENAME copyright)
 
 vcpkg_fixup_pkgconfig()
diff --git a/ports/libcerf/vcpkg.json b/ports/libcerf/vcpkg.json
@@ -1,7 +1,13 @@
 {
   "name": "libcerf",
-  "version-string": "1.13",
-  "port-version": 2,
+  "version": "1.13",
+  "port-version": 3,
   "description": "A self-contained numeric library that provides an efficient and accurate implementation of complex error functions, along with Dawson, Faddeeva, and Voigt functions.",
-  "homepage": "https://jugit.fz-juelich.de/mlz/libcerf"
+  "homepage": "https://jugit.fz-juelich.de/mlz/libcerf",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
 }
diff --git a/ports/liblbfgs/portfile.cmake b/ports/liblbfgs/portfile.cmake
@@ -8,15 +8,14 @@ vcpkg_from_github(
 
 message(STATUS "source path is : ${SOURCE_PATH}")
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFIX_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
 )
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/liblbfgs RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/liblbfgs" RENAME copyright)
diff --git a/ports/liblbfgs/vcpkg.json b/ports/liblbfgs/vcpkg.json
@@ -1,7 +1,13 @@
 {
   "name": "liblbfgs",
-  "version-string": "1.10",
-  "port-version": 1,
+  "version": "1.10",
+  "port-version": 2,
   "description": "libLBFGS: a library of Limited-memory Broyden-Fletcher-Goldfarb-Shanno (L-BFGS)",
-  "homepage": "http://www.chokkan.org/software/liblbfgs/"
+  "homepage": "http://www.chokkan.org/software/liblbfgs/",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
 }
diff --git a/ports/orc/portfile.cmake b/ports/orc/portfile.cmake
@@ -16,21 +16,21 @@ file(REMOVE "${SOURCE_PATH}/cmake_modules/FindProtobuf.cmake")
 file(REMOVE "${SOURCE_PATH}/cmake_modules/FindSnappy.cmake")
 file(REMOVE "${SOURCE_PATH}/cmake_modules/FindZLIB.cmake")
 
-if(CMAKE_HOST_WIN32)
-  set(PROTOBUF_EXECUTABLE ${CURRENT_INSTALLED_DIR}/tools/protobuf/protoc.exe)
-else()
-  set(PROTOBUF_EXECUTABLE ${CURRENT_INSTALLED_DIR}/tools/protobuf/protoc)
-endif()
+set(PROTOBUF_EXECUTABLE "${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}")
 
 if(VCPKG_TARGET_IS_WINDOWS)
   set(BUILD_TOOLS OFF)
 else()
   set(BUILD_TOOLS ON)
 endif()
 
-vcpkg_configure_cmake(
-  SOURCE_PATH ${SOURCE_PATH}
-  PREFER_NINJA
+if(VCPKG_TARGET_IS_UWP)
+    set(configure_opts WINDOWS_USE_MSBUILD)
+endif()
+
+vcpkg_cmake_configure(
+  SOURCE_PATH "${SOURCE_PATH}"
+  ${configure_opts}
   OPTIONS
     -DBUILD_TOOLS=${BUILD_TOOLS}
     -DBUILD_CPP_TESTS=OFF
@@ -42,23 +42,23 @@ vcpkg_configure_cmake(
     -DENABLE_TEST=OFF
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 
 file(GLOB TOOLS ${CURRENT_PACKAGES_DIR}/bin/orc-*)
 if(TOOLS)
-  file(COPY ${TOOLS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/orc)
+  file(COPY ${TOOLS} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/orc")
   file(REMOVE ${TOOLS})
 endif()
 
-file(GLOB BINS ${CURRENT_PACKAGES_DIR}/bin/*)
+file(GLOB BINS "${CURRENT_PACKAGES_DIR}/bin/*")
 if(NOT BINS)
-  file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+  file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 endif()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/orc/vcpkg.json b/ports/orc/vcpkg.json
@@ -1,14 +1,22 @@
 {
   "name": "orc",
-  "version-string": "1.6.4",
-  "port-version": 2,
+  "version": "1.6.4",
+  "port-version": 3,
   "description": "The smallest, fastest columnar storage for Hadoop workloads.",
   "homepage": "https://orc.apache.org/",
   "dependencies": [
     "gtest",
     "lz4",
     "protobuf",
+    {
+      "name": "protobuf",
+      "host": true
+    },
     "snappy",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
     "zlib",
     "zstd"
   ]

diff --git a/ports/physfs/portfile.cmake b/ports/physfs/portfile.cmake
@@ -9,7 +9,7 @@ vcpkg_download_distfile(ARCHIVE
 
 vcpkg_extract_source_archive_ex(
     OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE ${ARCHIVE}
+    ARCHIVE "${ARCHIVE}"
     REF ${PHYSFS_VERSION}
     PATCHES
         "001-fix-lzmasdk-arm64-windows.patch"
@@ -20,8 +20,13 @@ vcpkg_extract_source_archive_ex(
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" PHYSFS_STATIC)
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PHYSFS_SHARED)
 
+if(VCPKG_TARGET_IS_UWP)
+    set(configure_opts WINDOWS_USE_MSBUILD)
+endif()
+
 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}
+    SOURCE_PATH "${SOURCE_PATH}"
+    ${configure_opts}
     OPTIONS
         -DPHYSFS_BUILD_STATIC=${PHYSFS_STATIC}
         -DPHYSFS_BUILD_SHARED=${PHYSFS_SHARED}

diff --git a/ports/physfs/vcpkg.json b/ports/physfs/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "physfs",
   "version-semver": "3.0.2",
-  "port-version": 6,
+  "port-version": 7,
   "description": "a library to provide abstract access to various archives",
   "homepage": "https://icculus.org/physfs/",
   "dependencies": [

diff --git a/ports/physx/portfile.cmake b/ports/physx/portfile.cmake
@@ -40,6 +40,7 @@ set(OPTIONS_DEBUG
 
 if(VCPKG_TARGET_IS_UWP)
     list(APPEND OPTIONS "-DTARGET_BUILD_PLATFORM=uwp")
+    set(configure_options WINDOWS_USE_MSBUILD)
 elseif(VCPKG_TARGET_IS_WINDOWS)
     list(APPEND OPTIONS "-DTARGET_BUILD_PLATFORM=windows")
 elseif(VCPKG_TARGET_IS_OSX)
@@ -76,6 +77,7 @@ endif()
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}/physx/compiler/public"
+    ${configure_options}
     DISABLE_PARALLEL_CONFIGURE
     OPTIONS ${OPTIONS}
     OPTIONS_DEBUG ${OPTIONS_DEBUG}

diff --git a/ports/physx/vcpkg.json b/ports/physx/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "physx",
-  "version-semver": "4.1.2",
-  "port-version": 2,
+  "version": "4.1.2",
+  "port-version": 3,
   "description": "The NVIDIA PhysX SDK is a scalable multi-platform physics solution supporting a wide range of devices, from smartphones to high-end multicore CPUs and GPUs",
   "homepage": "https://github.com/NVIDIAGameWorks/PhysX",
   "license": null,

diff --git a/ports/sdl2/portfile.cmake b/ports/sdl2/portfile.cmake
@@ -29,8 +29,13 @@ if ("x11" IN_LIST FEATURES)
     message(WARNING "You will need to install Xorg dependencies to use feature x11:\nsudo apt install libx11-dev libxft-dev libxext-dev\n")
 endif()
 
+if(VCPKG_TARGET_IS_UWP)
+    set(configure_opts WINDOWS_USE_MSBUILD)
+endif()
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
+    ${configure_opts}
     OPTIONS ${FEATURE_OPTIONS}
         -DSDL_STATIC=${SDL_STATIC}
         -DSDL_SHARED=${SDL_SHARED}

diff --git a/ports/sdl2/vcpkg.json b/ports/sdl2/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "sdl2",
   "version": "2.0.20",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D.",
   "homepage": "https://www.libsdl.org/download-2.0.php",
   "dependencies": [

diff --git a/ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt b/ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt
@@ -147,6 +147,11 @@ foreach(flag CXX C SHARED_LINKER EXE_LINKER STATIC_LINKER RC)
         # Transform MSVC /flags to -flags due to bash scripts intepreting /flag as a path.
         # This is imperfect because it fails on directories with trailing spaces, but those are exceedingly rare
         string(REGEX REPLACE "(^| )/" "\\1-" ${flag}_FLAGS "${${flag}_FLAGS}")
+        if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+            if("${flag}" STREQUAL "CXX")
+                string(APPEND ${flag}_FLAGS " -ZW:nostdlib")
+            endif()
+        endif()
     endif()
     string(REPLACE "\\" "\\\\" ${flag}_FLAGS "${${flag}_FLAGS}")
     string(REPLACE "\"" "\\\"" ${flag}_FLAGS "${${flag}_FLAGS}")

diff --git a/ports/vcpkg-cmake/vcpkg.json b/ports/vcpkg-cmake/vcpkg.json
@@ -1,5 +1,5 @@
 {
   "name": "vcpkg-cmake",
-  "version-date": "2022-04-12",
+  "version-date": "2022-04-21",
   "license": "MIT"
 }
diff --git a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake
@@ -154,9 +154,6 @@ function(vcpkg_cmake_configure)
         # Prebuilt ninja binaries are only provided for x64 hosts
         set(ninja_can_be_used OFF)
         set(ninja_host OFF)
-    elseif(VCPKG_TARGET_IS_UWP)
-        # Ninja and MSBuild have many differences when targetting UWP, so use MSBuild to maximize existing compatibility
-        set(ninja_can_be_used OFF)
     endif()
 
     set(generator "Ninja")