mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-24 04:19:08 +08:00
Use Ninja rather than MSBuild in BlingFire to support UWP. (#31331)
Fixes #31330.
This commit is contained in:
parent
6107e4d36e
commit
60f251356d
9
ports/blingfire/ninja.patch
Normal file
9
ports/blingfire/ninja.patch
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
|
index 818a3da..e8b3bed 100644
|
||||||
|
--- a/CMakeLists.txt
|
||||||
|
+++ b/CMakeLists.txt
|
||||||
|
@@ -19,3 +19,3 @@ IF (WIN32 AND MSVC)
|
||||||
|
set (CMAKE_CXX_FLAGS " -DNDEBUG")
|
||||||
|
- add_compile_options("/O2" "/W4" "/GS" "/Gy" "/guard:cf" "/Gm-" "/Zc:inline" "/fp:precise" "/GF" "/EHsc" "/ZH:SHA_256")
|
||||||
|
+ add_compile_options("/W4" "/GS" "/Gy" "/guard:cf" "/Gm-" "/Zc:inline" "/fp:precise" "/GF" "/EHsc" "/ZH:SHA_256")
|
||||||
|
add_compile_options("$<$<CONFIG:Debug>:/Od>")
|
@ -4,11 +4,12 @@ vcpkg_from_github(
|
|||||||
REF c0381c68b6aa6d1b4e569888bae1642e40494a99
|
REF c0381c68b6aa6d1b4e569888bae1642e40494a99
|
||||||
SHA512 0fa15791fc815a992023bae6f30c84dda1d477bcdedcf1343d4dbe4b09b51e17fd87bf130d58e50f378ca94982a6306d7f980e3ff4522091be036428684bdcbb
|
SHA512 0fa15791fc815a992023bae6f30c84dda1d477bcdedcf1343d4dbe4b09b51e17fd87bf130d58e50f378ca94982a6306d7f980e3ff4522091be036428684bdcbb
|
||||||
HEAD_REF master
|
HEAD_REF master
|
||||||
|
PATCHES
|
||||||
|
ninja.patch
|
||||||
)
|
)
|
||||||
|
|
||||||
vcpkg_cmake_configure(
|
vcpkg_cmake_configure(
|
||||||
SOURCE_PATH "${SOURCE_PATH}"
|
SOURCE_PATH "${SOURCE_PATH}"
|
||||||
WINDOWS_USE_MSBUILD
|
|
||||||
OPTIONS
|
OPTIONS
|
||||||
${ADDITIONAL_OPTIONS}
|
${ADDITIONAL_OPTIONS}
|
||||||
)
|
)
|
||||||
|
@ -1,9 +1,10 @@
|
|||||||
{
|
{
|
||||||
"name": "blingfire",
|
"name": "blingfire",
|
||||||
"version": "0.1.8.1",
|
"version": "0.1.8.1",
|
||||||
|
"port-version": 1,
|
||||||
"description": "BlingFire is a lightning fast Finite State machine and REgular expression manipulation library.",
|
"description": "BlingFire is a lightning fast Finite State machine and REgular expression manipulation library.",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"supports": "windows & !static & !uwp",
|
"supports": "windows & !static",
|
||||||
"dependencies": [
|
"dependencies": [
|
||||||
{
|
{
|
||||||
"name": "vcpkg-cmake",
|
"name": "vcpkg-cmake",
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "70822350369b68d60a5640eca1b668e1829c8054",
|
||||||
|
"version": "0.1.8.1",
|
||||||
|
"port-version": 1
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "8352e7a158da2568b5c67c973b3692681be8b0d6",
|
"git-tree": "8352e7a158da2568b5c67c973b3692681be8b0d6",
|
||||||
"version": "0.1.8.1",
|
"version": "0.1.8.1",
|
||||||
|
@ -602,7 +602,7 @@
|
|||||||
},
|
},
|
||||||
"blingfire": {
|
"blingfire": {
|
||||||
"baseline": "0.1.8.1",
|
"baseline": "0.1.8.1",
|
||||||
"port-version": 0
|
"port-version": 1
|
||||||
},
|
},
|
||||||
"blitz": {
|
"blitz": {
|
||||||
"baseline": "2020-03-25",
|
"baseline": "2020-03-25",
|
||||||
|
Loading…
Reference in New Issue
Block a user