From cea2b1232af82690d90641b8480a7123f6009577 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Thu, 11 Mar 2021 04:04:40 +0800 Subject: [msix] Add DISABLE_PARALLEL_CONFIGURE (#16488) * [msix] Add DISABLE_PARALLEL_CONFIGURE * Update versions --- ports/msix/CONTROL | 6 ------ ports/msix/portfile.cmake | 1 + ports/msix/vcpkg.json | 16 ++++++++++++++++ versions/baseline.json | 4 ++-- versions/m-/msix.json | 5 +++++ 5 files changed, 24 insertions(+), 8 deletions(-) delete mode 100644 ports/msix/CONTROL create mode 100644 ports/msix/vcpkg.json diff --git a/ports/msix/CONTROL b/ports/msix/CONTROL deleted file mode 100644 index ec246a877..000000000 --- a/ports/msix/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: msix -Version: 1.7-2 -Build-Depends: xerces-c, zlib, openssl (!uwp&!windows), catch2 -Homepage: https://github.com/microsoft/msix-packaging -Description: The MSIX Packaging SDK project is an effort to enable developers on a variety of platforms to pack and unpack packages for the purposes of distribution from either the Microsoft Store, or their own content distribution networks. - The MSIX Packaging APIs that a client app would use to interact with .msix/.appx packages are a subset of those documented here. See sample/ExtractContentsSample/ExtractContentsSample.cpp for additional details. diff --git a/ports/msix/portfile.cmake b/ports/msix/portfile.cmake index 249d6fd8f..2dbd06fe8 100644 --- a/ports/msix/portfile.cmake +++ b/ports/msix/portfile.cmake @@ -32,6 +32,7 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA NO_CHARSET_FLAG + DISABLE_PARALLEL_CONFIGURE OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON -DINSTALL_LIBMSIX=ON diff --git a/ports/msix/vcpkg.json b/ports/msix/vcpkg.json new file mode 100644 index 000000000..b3e01e092 --- /dev/null +++ b/ports/msix/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "msix", + "version": "1.7", + "port-version": 3, + "description": "The MSIX Packaging SDK project is an effort to enable developers on a variety of platforms to pack and unpack packages for the purposes of distribution from either the Microsoft Store, or their own content distribution networks.The MSIX Packaging APIs that a client app would use to interact with .msix/.appx packages are a subset of those documented here. See sample/ExtractContentsSample/ExtractContentsSample.cpp for additional details.", + "homepage": "https://github.com/microsoft/msix-packaging", + "dependencies": [ + "catch2", + { + "name": "openssl", + "platform": "!uwp & !windows" + }, + "xerces-c", + "zlib" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 0aaed605a..47b701593 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3977,8 +3977,8 @@ "port-version": 0 }, "msix": { - "baseline": "1.7-2", - "port-version": 0 + "baseline": "1.7", + "port-version": 3 }, "msmpi": { "baseline": "10.1", diff --git a/versions/m-/msix.json b/versions/m-/msix.json index b886d12d8..f76cdce2f 100644 --- a/versions/m-/msix.json +++ b/versions/m-/msix.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e544825ca69bfca4e3f54141bf62cacb1cd878ea", + "version": "1.7", + "port-version": 3 + }, { "git-tree": "d99bfeedaecfb8155ed9a404e3aa683f1b1df72a", "version-string": "1.7-2", -- cgit v1.2.3