From 3e2dd76ee0df0d1769d1e3f41a0743693eb75c1c Mon Sep 17 00:00:00 2001 From: Richard Osborne Date: Tue, 25 Aug 2026 10:09:24 -0500 Subject: [PATCH 1/3] Upgrade to Electron 43 --- .github/workflows/build.yml | 4 ++-- CMakeLists.txt | 4 ++-- ci/build-osx.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bb860fb..8c86c48 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,7 @@ env: FULL_DISTRIBUTE_PATH: build/distribute RUNTIME_URL: https://artifacts.electronjs.org/headers/dist RUNTIME_NAME: iojs - RUNTIME_VERSION: v29.4.3 + RUNTIME_VERSION: v43.2.0 permissions: contents: read @@ -58,7 +58,7 @@ jobs: - name: Install Node.js uses: actions/setup-node@v4 with: - node-version: '20.x' + node-version: '24.x' - name: Install dependencies run: yarn install diff --git a/CMakeLists.txt b/CMakeLists.txt index e740442..02fe87a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ if(APPLE) endif() if (NOT CMAKE_OSX_DEPLOYMENT_TARGET) if ("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64") - set(CMAKE_OSX_DEPOLYMENT_TARGET "11.0") + set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0") else() set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15") endif() @@ -22,7 +22,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake") SET(NODEJS_URL "https://artifacts.electronjs.org/headers/dist" CACHE STRING "Node.JS URL") SET(NODEJS_NAME "iojs" CACHE STRING "Node.JS Name") -SET(NODEJS_VERSION "v29.4.3" CACHE STRING "Node.JS Version") +SET(NODEJS_VERSION "v43.2.0" CACHE STRING "Node.JS Version") include(NodeJS) include(CPack) diff --git a/ci/build-osx.sh b/ci/build-osx.sh index 9a4d869..ff96825 100755 --- a/ci/build-osx.sh +++ b/ci/build-osx.sh @@ -33,7 +33,7 @@ fi # Configure cmake .. \ --DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 \ +-DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET} \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_PREFIX=${FULL_DISTRIBUTE_PATH}/node-window-rendering \ ${NODEJS_NAME_PARAM} \ From acd1d0b2186890ab14c5b834974c0826478be8be Mon Sep 17 00:00:00 2001 From: Richard Osborne Date: Tue, 25 Aug 2026 17:10:13 -0500 Subject: [PATCH 2/3] use CMake setting for osx deployment target --- ci/build-osx.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/build-osx.sh b/ci/build-osx.sh index ff96825..6226979 100755 --- a/ci/build-osx.sh +++ b/ci/build-osx.sh @@ -33,7 +33,6 @@ fi # Configure cmake .. \ --DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET} \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_PREFIX=${FULL_DISTRIBUTE_PATH}/node-window-rendering \ ${NODEJS_NAME_PARAM} \ From ef589b4e1c5f6c310d17944c1a470cf6c2c30ee9 Mon Sep 17 00:00:00 2001 From: Richard Osborne Date: Wed, 26 Aug 2026 19:07:28 -0500 Subject: [PATCH 3/3] set CMAKE_OSX_DEPLOYMENT_TARGET before initial toolchain initialization --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 02fe87a..b28b48a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,4 @@ cmake_minimum_required(VERSION 3.5) -project(node_window_rendering) if(APPLE) if (NOT CMAKE_OSX_ARCHITECTURES) @@ -14,6 +13,8 @@ if(APPLE) endif() endif() +project(node_window_rendering) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake") #############################