Skip to content

Little CMake fixes #2009

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

Open
slipher wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Little CMake fixes #2009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3e17f18
Plumb CMAKE_VERBOSE_MAKEFILE to NaCl subprojects
slipher Oct 12, 2026
0e70870
cmake: fix using relative path for EXTERNAL_DEPS_DIR
slipher Oct 12, 2026
7f1c526
cmake: update outdated outdated deps detection regex
slipher Oct 12, 2026
65e0d1a
Comment fixup following Github Actions migration
slipher Oct 12, 2026
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
2 changes: 1 addition & 1 deletion .appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
5 changes: 3 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -201,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")

Expand Down Expand Up @@ -377,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()
Expand Down
Loading