Skip to content

Commit c876b14

Browse files
authored
Upgrade to Electron 43 (#22)
* use CMake setting for osx deployment target * set CMAKE_OSX_DEPLOYMENT_TARGET before initial toolchain initialization
1 parent f9046ed commit c876b14

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ env:
2121
FULL_DISTRIBUTE_PATH: build/distribute
2222
RUNTIME_URL: https://artifacts.electronjs.org/headers/dist
2323
RUNTIME_NAME: iojs
24-
RUNTIME_VERSION: v29.4.3
24+
RUNTIME_VERSION: v43.2.0
2525

2626
permissions:
2727
contents: read
@@ -58,7 +58,7 @@ jobs:
5858
- name: Install Node.js
5959
uses: actions/setup-node@v4
6060
with:
61-
node-version: '20.x'
61+
node-version: '24.x'
6262

6363
- name: Install dependencies
6464
run: yarn install

CMakeLists.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
cmake_minimum_required(VERSION 3.5)
2-
project(node_window_rendering)
32

43
if(APPLE)
54
if (NOT CMAKE_OSX_ARCHITECTURES)
65
set(CMAKE_OSX_ARCHITECTURES "${CMAKE_HOST_SYSTEM_PROCESSOR}")
76
endif()
87
if (NOT CMAKE_OSX_DEPLOYMENT_TARGET)
98
if ("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")
10-
set(CMAKE_OSX_DEPOLYMENT_TARGET "11.0")
9+
set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0")
1110
else()
1211
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15")
1312
endif()
1413
endif()
1514
endif()
1615

16+
project(node_window_rendering)
17+
1718
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
1819

1920
#############################
@@ -22,7 +23,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
2223

2324
SET(NODEJS_URL "https://artifacts.electronjs.org/headers/dist" CACHE STRING "Node.JS URL")
2425
SET(NODEJS_NAME "iojs" CACHE STRING "Node.JS Name")
25-
SET(NODEJS_VERSION "v29.4.3" CACHE STRING "Node.JS Version")
26+
SET(NODEJS_VERSION "v43.2.0" CACHE STRING "Node.JS Version")
2627

2728
include(NodeJS)
2829
include(CPack)

ci/build-osx.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ fi
3333

3434
# Configure
3535
cmake .. \
36-
-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 \
3736
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
3837
-DCMAKE_INSTALL_PREFIX=${FULL_DISTRIBUTE_PATH}/node-window-rendering \
3938
${NODEJS_NAME_PARAM} \

0 commit comments

Comments
 (0)