From 3e17f182794d0f4b305af7773600a2c9e690f55f Mon Sep 17 00:00:00 2001 From: slipher Date: Sun, 11 Oct 2026 21:16:44 -0500 Subject: [PATCH 1/4] Plumb CMAKE_VERBOSE_MAKEFILE to NaCl subprojects --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 65ff1a430b..1b25bb3b5f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -141,6 +141,7 @@ set(DEFAULT_NACL_VM_INHERITED_OPTIONS BUILD_CGAME BUILD_SGAME CMAKE_BUILD_TYPE + CMAKE_VERBOSE_MAKEFILE DAEMON_CBSE_PYTHON_PATH USE_ARCH_INTRINSICS USE_COMPILER_CUSTOMIZATION From 0e70870b2d5c581932b1a392a285e124e9134caf Mon Sep 17 00:00:00 2001 From: slipher Date: Sun, 11 Oct 2026 21:51:52 -0500 Subject: [PATCH 2/4] cmake: fix using relative path for EXTERNAL_DEPS_DIR Using type PATH (i.e. directory) instead of STRING for the configuration variable auto-converts it to an absolute path so that it works correctly if you configure it with a relative path. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1b25bb3b5f..782d10a20a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -202,7 +202,7 @@ endmacro() set(DEFAULT_USE_EXTERNAL_DEPS_LIBS ON) if (USE_EXTERNAL_DEPS AND NOT YOKAI_TARGET_SYSTEM_NACL) - set(EXTERNAL_DEPS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/external_deps" CACHE STRING "Directory in which to store the downloaded dependencies.") + set(EXTERNAL_DEPS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/external_deps" CACHE PATH "Directory in which to store the downloaded dependencies.") set(DEPS_EXT ".tar.xz") From 7f1c5268e6c84c46010588e1cba1277e9694dee6 Mon Sep 17 00:00:00 2001 From: slipher Date: Mon, 12 Oct 2026 02:10:46 -0500 Subject: [PATCH 3/4] cmake: update outdated outdated deps detection regex --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 782d10a20a..6af566d9bf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -378,7 +378,7 @@ if (DEPS_DIR) endif() endif() - if (cacheVariableValue MATCHES "/(linux|windows|macos)-(i686|amd64)-(default|mingw|msvc)_([0-9]+)/") + if (cacheVariableValue MATCHES "/(linux|windows|macos)-(i686|amd64|armhf|arm64)-(default|mingw|msvc)_([0-9]+)/") if (NOT ${CMAKE_MATCH_4} EQUAL ${DEPS_VERSION}) set(OLD_VERSION ${CMAKE_MATCH_4}) endif() From 65e0d1aa7b5cdc301ca148c32708d4de5d055afa Mon Sep 17 00:00:00 2001 From: slipher Date: Mon, 12 Oct 2026 02:55:07 -0500 Subject: [PATCH 4/4] Comment fixup following Github Actions migration --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 5b29ca6ea2..22ce24b5b0 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -5,7 +5,7 @@ skip_branch_with_pr: true only_commits: files: - .appveyor.yml - # The rest of this list should stay in sync with azure-pipelines.yml + # The rest of this list should stay in sync with .github/worklows/build_test.yml - src/ - libs/ - cmake/