Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[vcpkg script] ninja 1.12 #41980

Merged
merged 12 commits into from
Jan 15, 2025
Merged

[vcpkg script] ninja 1.12 #41980

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
883f01d
Update Ninja to 1.12.
BillyONeal Jun 13, 2024
a632c24
1.12.1
BillyONeal Jun 13, 2024
991c848
Merge branch 'ninja-1-12' of https://github.com/BillyONeal/vcpkg
dg0yt Nov 6, 2024
7ee4066
Merge branch 'microsoft:master' into ninja
dg0yt Nov 13, 2024
081c69d
[qt5-webengine] Check ninja version
dg0yt Nov 21, 2024
8ca510c
[qt5-webengine] Skip in vcpkg CI
dg0yt Nov 21, 2024
e9f7985
Merge remote-tracking branch 'origin/master' into ninja
dg0yt Dec 7, 2024
02175f1
Fixup
dg0yt Dec 7, 2024
d9f3ba4
Merge branch 'microsoft:master' into ninja
dg0yt Jan 6, 2025
155270d
Merge branch 'microsoft:master' into ninja
dg0yt Jan 8, 2025
140ea0c
[libdatachannel] Disable parallel configure
dg0yt Jan 10, 2025
fa6786f
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Jan 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[qt5-webengine] Check ninja version
  • Loading branch information
@dg0yt
dg0yt committed Nov 21, 2024
commit 081c69d000912131ffcc18a30c07e27b594522a0
13 changes: 13 additions & 0 deletions ports/qt5-webengine/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,19 @@ vcpkg_add_to_path(PREPEND "${GPERF_DIR}")
vcpkg_add_to_path(PREPEND "${NINJA_DIR}")
vcpkg_add_to_path(PREPEND "${NODEJS_DIR}")

vcpkg_execute_in_download_mode(
COMMAND "${NINJA}" --version
OUTPUT_VARIABLE ninja_version
OUTPUT_STRIP_TRAILING_WHITESPACE
WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}"
)
if(ninja_version VERSION_GREATER_EQUAL "1.12.1")
message(WARNING
"Found ninja version ${ninja_version} which may fail to build ${PORT}."
"You can supply a different filepath using per-port customization of CMake variable NINJA."
)
endif()

set(PATCHES common.pri.patch
gl.patch
build_1.patch
Expand Down
1 change: 1 addition & 0 deletions ports/qt5-webengine/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "qt5-webengine",
"version": "5.15.15",
"port-version": 1,
"description": "Qt WebEngine provides functionality for rendering regions of dynamic web content.",
"license": null,
"supports": "!static",
Expand Down
6 changes: 3 additions & 3 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5665,8 +5665,8 @@
"port-version": 1
},
"luau": {
"baseline": "0.651",
"port-version": 0
"baseline": "0.651",
"port-version": 0
},
"luminoengine": {
"baseline": "0.10.1",
Expand Down Expand Up @@ -7502,7 +7502,7 @@
},
"qt5-webengine": {
"baseline": "5.15.15",
"port-version": 0
"port-version": 1
},
"qt5-webglplugin": {
"baseline": "5.15.15",
Expand Down
5 changes: 5 additions & 0 deletions versions/q-/qt5-webengine.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "8c0302ffbef2d114f867ba6b0b34cfe1de78bb44",
"version": "5.15.15",
"port-version": 1
},
{
"git-tree": "eeece45f507ad36455883b753c5914ef7e266c26",
"version": "5.15.15",
Expand Down