Skip to content

Commit c93294d

Browse files
SunBlackSunBlack
authored
Update to CMake 3.31.10 (#48250)
1 parent 5883199 commit c93294d

File tree

7 files changed

+47
-27
lines changed

7 files changed

+47
-27
lines changed

‎ports/quickjs-ng/pdb_name_conflict.patch‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index f49a052..8e3c74c 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -304,6 +304,7 @@ add_qjs_libc_if_needed(qjs_exe)
6+
add_static_if_needed(qjs_exe)
7+
set_target_properties(qjs_exe PROPERTIES
8+
OUTPUT_NAME "qjs"
9+
+ PDB_NAME "qjs_exe"
10+
)
11+
target_compile_definitions(qjs_exe PRIVATE ${qjs_defines})
12+
target_link_libraries(qjs_exe qjs)

‎ports/quickjs-ng/portfile.cmake‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ vcpkg_from_github(
88
REF v${VERSION}
99
SHA512 c8b1920bab954f5fa891956f330875478e5b17161d24f8b96db05108d61354dab0621f2a36c5ae421ffbfb9817d90c7a62fe1bd4f84ad149dd2d569c356a2788
1010
HEAD_REF master
11+
PATCHES
12+
pdb_name_conflict.patch
1113
)
1214

1315
vcpkg_cmake_configure(

‎ports/quickjs-ng/vcpkg.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"name": "quickjs-ng",
33
"version": "0.11.0",
4+
"port-version": 1,
45
"description": "QuickJS, the Next Generation: a mighty JavaScript engine. A small and embeddable JavaScript engine supporting the latest ECMAScript specification.",
56
"homepage": "https://github.com/quickjs-ng/quickjs",
67
"license": "MIT",

‎scripts/cmake/vcpkg_from_git.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ function(vcpkg_from_git)
2424
if(DEFINED arg_FETCH_REF AND NOT DEFINED arg_REF)
2525
message(FATAL_ERROR "REF must be specified if FETCH_REF is specified")
2626
endif()
27-
if(NOT DEFINED arg_LFS AND "LFS" IN_LIST arg_KEYWORDS_MISSING_VALUES)
27+
if(DEFINED arg_LFS AND arg_LFS STREQUAL "")
2828
set(arg_LFS "${arg_URL}")
2929
endif()
3030

‎scripts/vcpkg-tools.json‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -23,50 +23,50 @@
2323
"name": "cmake",
2424
"os": "windows",
2525
"arch": "amd64",
26-
"version": "3.30.1",
27-
"executable": "cmake-3.30.1-windows-i386/bin/cmake.exe",
28-
"url": "https://github.com/Kitware/CMake/releases/download/v3.30.1/cmake-3.30.1-windows-i386.zip",
29-
"sha512": "0b74bd4222064cfb6e42838987704eb21d57ad5f7bbd87714ab570f1d107fa19bd2f14316475338518292bc377bf38b581a07c73267a775cd385bbd1800879b4",
30-
"archive": "cmake-3.30.1-windows-i386.zip"
26+
"version": "3.31.10",
27+
"executable": "cmake-3.31.10-windows-x86_64/bin/cmake.exe",
28+
"url": "https://github.com/Kitware/CMake/releases/download/v3.31.10/cmake-3.31.10-windows-x86_64.zip",
29+
"sha512": "50c71aa15a05eaf8d7592d9648efb986df74ab716dc1f1a03795351284c6212b70ad439a1d9f3575d60cf49b0a5579cad551cc6a3fe2911ae8ecb08add60fc60",
30+
"archive": "cmake-3.31.10-windows-x86_64.zip"
3131
},
3232
{
3333
"name": "cmake",
3434
"os": "windows",
3535
"arch": "arm64",
36-
"version": "3.30.1",
37-
"executable": "cmake-3.30.1-windows-arm64/bin/cmake.exe",
38-
"url": "https://github.com/Kitware/CMake/releases/download/v3.30.1/cmake-3.30.1-windows-arm64.zip",
39-
"sha512": "40bcdeff5ff40044629f49e0effc958a719353330ea39876b919fb7c2d441885c884acf43e644ab5dedcb95503d211c895da1c0b6360e71449bea6a981f8e128",
40-
"archive": "cmake-3.30.1-windows-arm64.zip"
36+
"version": "3.31.10",
37+
"executable": "cmake-3.31.10-windows-arm64/bin/cmake.exe",
38+
"url": "https://github.com/Kitware/CMake/releases/download/v3.31.10/cmake-3.31.10-windows-arm64.zip",
39+
"sha512": "a894518004b1e99c008e2554fd7a0b2f714ad6bf12e9c0bd34f62d808546e5773845e3f4c2a44f03cae30fa52bb604760aec6a452327ef38c5cf94e593eb8587",
40+
"archive": "cmake-3.31.10-windows-arm64.zip"
4141
},
4242
{
4343
"name": "cmake",
4444
"os": "osx",
45-
"version": "3.30.1",
46-
"executable": "cmake-3.30.1-macos-universal/CMake.app/Contents/bin/cmake",
47-
"url": "https://github.com/Kitware/CMake/releases/download/v3.30.1/cmake-3.30.1-macos-universal.tar.gz",
48-
"sha512": "71290d3b5e51724711e8784f5b21100cb0cffdbb889da7572a26dd171d9052601496de8d39c42d76ef3a9245af2ab35a590bf53ad68d7bb8a2047b64272d2647",
49-
"archive": "cmake-3.30.1-macos-universal.tar.gz"
45+
"version": "3.31.10",
46+
"executable": "cmake-3.31.10-macos-universal/CMake.app/Contents/bin/cmake",
47+
"url": "https://github.com/Kitware/CMake/releases/download/v3.31.10/cmake-3.31.10-macos-universal.tar.gz",
48+
"sha512": "5960326dee8227bf27cdd2d94c336835b7bf1b11c443c35ecf2b50a811c7874fcc3400a3b793e4720ef6505d66aed597ecdaf6c77b12db69abafcccd0659182d",
49+
"archive": "cmake-3.31.10-macos-universal.tar.gz"
5050
},
5151
{
5252
"name": "cmake",
5353
"os": "linux",
5454
"arch": "arm64",
55-
"version": "3.30.1",
56-
"executable": "cmake-3.30.1-linux-aarch64/bin/cmake",
57-
"url": "https://github.com/Kitware/CMake/releases/download/v3.30.1/cmake-3.30.1-linux-aarch64.tar.gz",
58-
"sha512": "ec6c1c682dda2381aa5ebef98a2597e4ab6b4563639c28b2f30c20360694b902a7b33c175c796169a9f99ed139f053916042caed58d83298680894c2840dbb87",
59-
"archive": "cmake-3.30.1-linux-aarch64.tar.gz"
55+
"version": "3.31.10",
56+
"executable": "cmake-3.31.10-linux-aarch64/bin/cmake",
57+
"url": "https://github.com/Kitware/CMake/releases/download/v3.31.10/cmake-3.31.10-linux-aarch64.tar.gz",
58+
"sha512": "e45c23cd756a9b4699a54d52bd196e3c1c2e63fab893846eeb8a0e1eabb2caa54629bd857518ab5ce5701d9179bb308bf6b4866d07bb8d7b87e04d895d10289d",
59+
"archive": "cmake-3.31.10-linux-aarch64.tar.gz"
6060
},
6161
{
6262
"name": "cmake",
6363
"os": "linux",
64-
"version": "3.30.1",
64+
"version": "3.31.10",
6565
"arch": "amd64",
66-
"executable": "cmake-3.30.1-linux-x86_64/bin/cmake",
67-
"url": "https://github.com/Kitware/CMake/releases/download/v3.30.1/cmake-3.30.1-linux-x86_64.tar.gz",
68-
"sha512": "84ce1333ed696a1736986fba2853c5d8db0e4c9addaf4a4723911248c6d49ecf545adf8bd46091d198fc7bd1e6c896798661463aa1ce3a726a093883aaa19adf",
69-
"archive": "cmake-3.30.1-linux-x86_64.tar.gz"
66+
"executable": "cmake-3.31.10-linux-x86_64/bin/cmake",
67+
"url": "https://github.com/Kitware/CMake/releases/download/v3.31.10/cmake-3.31.10-linux-x86_64.tar.gz",
68+
"sha512": "2555ae413b19a2acfc8d3c4520f0ecc87811ac1e121bec718b679006d03083dfe7218a68e0af0263a80bd8fbb2d23b5975f4533638b71ef9ad62272640f62356",
69+
"archive": "cmake-3.31.10-linux-x86_64.tar.gz"
7070
},
7171
{
7272
"name": "git",

‎versions/baseline.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8342,7 +8342,7 @@
83428342
},
83438343
"quickjs-ng": {
83448344
"baseline": "0.11.0",
8345-
"port-version": 0
8345+
"port-version": 1
83468346
},
83478347
"quill": {
83488348
"baseline": "11.0.1",

‎versions/q-/quickjs-ng.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "5c4169e09b13642be14ccbecc0cf253367fee229",
5+
"version": "0.11.0",
6+
"port-version": 1
7+
},
38
{
49
"git-tree": "d060749a62c2f7e9888fd408c9a6d1dbf0b1c8d4",
510
"version": "0.11.0",

0 commit comments

Comments
 (0)