Skip to content

cmake: make DaemonPlatform, Architecture, Compiler, etc. autonomous and reusable #1641

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
illwieckz wants to merge 13 commits into
base: master
Choose a base branch
from
+788 −500
Open

cmake: make DaemonPlatform, Architecture, Compiler, etc. autonomous and reusable #1641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5326baf
cmake: prefix ARCH and NACL_ARCH with DAEMON
illwieckz Dec 16, 2025
0b7240c
cmake: extend DaemonPlatform/System to detect host system and target …
illwieckz Dec 9, 2025
0f5fbfa
cmake: remove unsupported platform thing, they're now considered unknown
illwieckz Dec 16, 2025
f02d80a
cmake: make DaemonPlatform, Architecture, Compiler, etc. autonomous a…
illwieckz Apr 7, 2025
f1920e9
cmake: use compiler detection instead of “MSVC” and “NOT MSVC AND WIN32”
illwieckz Dec 16, 2025
0183093
cmake: mutualize the detection framework
illwieckz Dec 16, 2025
a3fbb21
cmake: do not write buildinfo files when SourceGenerator isn't included
illwieckz Dec 16, 2025
99dffb0
cmake: report native NaCl nexe architecture and “pnacl” for pexe
illwieckz Dec 16, 2025
c631f8f
cmake: generate printable DAEMON_SYSTEM_STRING
illwieckz Dec 16, 2025
49f356c
cmake: unify the wording of Platform detected names
illwieckz Dec 16, 2025
19af603
cmake: rewrite comments
illwieckz Jun 4, 2026
6d84b26
cmake: rename DaemonPlatform to Yokai, use custom variable slug
illwieckz Jun 4, 2026
ad6906a
yokai: drop custom variable slug
illwieckz Jun 4, 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
91 changes: 45 additions & 46 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,7 @@ if (Daemon_OUT)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${Daemon_OUT})
endif()

include(DaemonSourceGenerator)
include(DaemonPlatform)
include(Yokai/All)

################################################################################
# Configuration options
Expand All @@ -91,11 +90,11 @@ if(NOT DAEMON_EXTERNAL_APP)

set(NACL_RUNTIME_PATH "" CACHE STRING "Directory containing the NaCl binaries")

if (WIN32)
if (YOKAI_SYSTEM_Windows)
# The alternative code is based on non-curses unix terminal functions.
set(USE_CURSES ON)
else()
if (NOT APPLE)
if (NOT YOKAI_SYSTEM_macOS)
# Not supported on macOS because the included version is too old.
option(USE_CURSES_NCURSES "Use ncurses instead of PDCursesMod" ON)
endif()
Expand Down Expand Up @@ -200,29 +199,29 @@ endmacro()

set(DEFAULT_USE_EXTERNAL_DEPS_LIBS ON)

if (USE_EXTERNAL_DEPS AND NOT NACL)
if (USE_EXTERNAL_DEPS AND NOT YOKAI_SYSTEM_NaCl)
set(EXTERNAL_DEPS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/external_deps" CACHE STRING "Directory in which to store the downloaded dependencies.")

set(DEPS_EXT ".tar.xz")

set(DEPS_ARCH "${ARCH}")
set(DEPS_ARCH "${YOKAI_ARCH_NAME}")

if (MSVC)
if (YOKAI_CXX_COMPILER_MSVC)
set(DEPS_COMPILER msvc)
elseif (WIN32)
elseif (YOKAI_CXX_COMPILER_MinGW)
set(DEPS_COMPILER mingw)
else()
set(DEPS_COMPILER default)
endif()

if (WIN32)
if (YOKAI_SYSTEM_Windows)
set(DEPS_SYSTEM windows)
set(SUPPORTED_${DEPS_SYSTEM}_ARCH amd64 i686)
elseif (APPLE)
elseif (YOKAI_SYSTEM_macOS)
set(DEPS_SYSTEM macos)
set(SUPPORTED_${DEPS_SYSTEM}_ARCH amd64)

if (ARCH STREQUAL arm64)
if (YOKAI_ARCH_arm64)
set(DEPS_ARCH amd64)

set_deps_dir()
Expand All @@ -231,10 +230,10 @@ if (USE_EXTERNAL_DEPS AND NOT NACL)
set(DEFAULT_USE_EXTERNAL_DEPS_LIBS OFF)
endif()
endif()
elseif (LINUX)
elseif (YOKAI_SYSTEM_Linux)
set(DEPS_SYSTEM linux)
set(SUPPORTED_${DEPS_SYSTEM}_ARCH amd64 i686 arm64 armhf)
elseif (FREEBSD)
elseif (YOKAI_SYSTEM_FreeBSD)
set(DEPS_SYSTEM freebsd)
set(SUPPORTED_${DEPS_SYSTEM}_ARCH amd64 i686)

Expand Down Expand Up @@ -265,7 +264,7 @@ endif()

option(USE_EXTERNAL_DEPS_LIBS "Build and link against libraries from the EXTERNAL_DEPS_DIR" ${DEFAULT_USE_EXTERNAL_DEPS_LIBS})

if (USE_EXTERNAL_DEPS AND NOT NACL)
if (USE_EXTERNAL_DEPS AND NOT YOKAI_SYSTEM_NaCl)
if (DEPS_DIR)
message(STATUS "Using external deps dir: ${DEPS_DIR}")

Expand Down Expand Up @@ -463,23 +462,23 @@ endif()

# Native client
include(DaemonNacl)
if (NACL)
if (YOKAI_SYSTEM_NaCl)
add_library(srclibs-nacl-module EXCLUDE_FROM_ALL ${NACLLIST_MODULE})
set(LIBS_BASE ${LIBS_BASE} srclibs-nacl-module)
else()
add_library(srclibs-nacl-native EXCLUDE_FROM_ALL ${NACLLIST_NATIVE})
set_target_properties(srclibs-nacl-native PROPERTIES POSITION_INDEPENDENT_CODE 1 FOLDER "libs")
if (APPLE)
if (YOKAI_SYSTEM_macOS)
# Do not error for OSAtomic* deprecation notices
target_compile_options(srclibs-nacl-native PRIVATE "-Wno-error=deprecated-declarations")
endif()
set(LIBS_BASE ${LIBS_BASE} srclibs-nacl-native)
endif()

# Base OS libs
if (WIN32)
if (YOKAI_SYSTEM_Windows)
set(LIBS_BASE ${LIBS_BASE} winmm ws2_32)
elseif (NACL)
elseif (YOKAI_SYSTEM_NaCl)
find_library(NACL_EXCEPTION nacl_exception)
find_library(NACL_MINIDUMP minidump_generator)

Expand Down Expand Up @@ -511,7 +510,7 @@ else()
set(LIBS_BASE ${LIBS_BASE} ${CMAKE_DL_LIBS})
find_package(Threads REQUIRED)
set(LIBS_BASE ${LIBS_BASE} ${CMAKE_THREAD_LIBS_INIT})
if (APPLE)
if (YOKAI_SYSTEM_macOS)
set(LIBS_CLIENT ${LIBS_CLIENT} "-framework Carbon" "-framework IOKit" "-framework Cocoa")
endif()
endif()
Expand All @@ -534,7 +533,7 @@ else()

# Look for OpenGL here before we potentially switch to looking for static libs.
if (BUILD_CLIENT)
if (LINUX OR FREEBSD)
if (YOKAI_SYSTEM_Unix_COMPATIBILITY)
Copy link
Copy Markdown
Member

@slipher slipher Jun 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume "Unix compatibility" would include Mac? Then this is wrong because this GLVND stuff should not be set on Mac.

# Set LEGACY OpenGL ABI if the variable is not explictly set.
# The backward-incompatible GLVND OpenGL ABI should only be used
# by developers who have a good reason to require it.
Expand All @@ -550,7 +549,7 @@ else()
# This code is unreachable since it already errored out at find_package time.
# This code only executes if OpenGL is supported, either because the GLVND ABI
# is available, either because the LEGACY ABI is available.
if (LINUX OR FREEBSD)
if (YOKAI_SYSTEM_Unix_COMPATIBILITY)
if (NOT OPENGL_gl_LIBRARY)
# When OpenGL_GL_PREFERENCE is supported and GLVND is available
# OPENGL_gl_LIBRARY is expected to be empty. So we can use the
Expand Down Expand Up @@ -588,7 +587,7 @@ else()
message(STATUS "Found OpenGL ABI: ${OpenGL_selected_ABI}")
message(STATUS "Found OpenGL library: ${OpenGL_selected_LIBRARY}")

daemon_add_buildinfo("char*" "DAEMON_OPENGL_ABI_STRING" "\"${OpenGL_selected_ABI}\"")
yokai_add_buildinfo("char*" "DAEMON_OPENGL_ABI_STRING" "\"${OpenGL_selected_ABI}\"")
add_definitions("-DDAEMON_OPENGL_ABI_${OpenGL_selected_ABI}")
add_definitions("-DDAEMON_OPENGL_ABI")
endif()
Expand All @@ -597,7 +596,7 @@ endif()

# Prefer static libs
if ( USE_STATIC_LIBS )
if (LINUX OR FREEBSD)
if (YOKAI_SYSTEM_Unix_COMPATIBILITY)
set(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
endif()
endif()
Expand Down Expand Up @@ -625,7 +624,7 @@ if (BUILD_CLIENT OR BUILD_TTY_CLIENT OR BUILD_SERVER OR BUILD_DUMMY_APP)
set(LIBS_ENGINE_BASE ${LIBS_ENGINE_BASE} ${CURSESW_LIBRARIES})
include_directories(${CURSESW_INCLUDE_DIR})
else ()
if (WIN32)
if (YOKAI_SYSTEM_Windows)
set(LIBS_ENGINE_BASE ${LIBS_ENGINE_BASE} gdi32 comdlg32)
endif()

Expand All @@ -640,7 +639,7 @@ endif()

if (BUILD_CLIENT OR BUILD_TTY_CLIENT OR BUILD_SERVER OR BUILD_DUMMY_APP)
if (NACL_RUNTIME_PATH)
daemon_add_buildinfo("char*" "DAEMON_NACL_RUNTIME_PATH_STRING" "\"${NACL_RUNTIME_PATH}\"")
yokai_add_buildinfo("char*" "DAEMON_NACL_RUNTIME_PATH_STRING" "\"${NACL_RUNTIME_PATH}\"")
add_definitions("-DDAEMON_NACL_RUNTIME_PATH")
endif()

Expand Down Expand Up @@ -675,23 +674,23 @@ if (BUILD_CLIENT OR BUILD_TTY_CLIENT)
endif()

# SDL, required for all targets on win32 because of iconv and SDL_SetHint(SDL_TIMER_RESOLUTION, 0)
if (BUILD_CLIENT OR WIN32)
if (BUILD_CLIENT OR YOKAI_SYSTEM_Windows)
# Use our detected architecture instead of letting SDL do it again
# Note that sdlcpu.cmake is only included on a random subset of platforms
set(sdlvar_i686 SDL_CPU_X86)
set(sdlvar_amd64 SDL_CPU_X64)
set(sdlvar_armhf SDL_CPU_ARM32)
set(sdlvar_arm64 SDL_CPU_ARM64)
if (sdlvar_${ARCH})
set(${sdlvar_${ARCH}} 1)
if (sdlvar_${YOKAI_ARCH_NAME})
set(${sdlvar_${YOKAI_ARCH_NAME}} 1)
else()
message("Developer TODO: translate architecture ${ARCH} for SDL")
message("Developer TODO: translate architecture ${YOKAI_ARCH_NAME} for SDL")
endif()

find_package(SDL3 REQUIRED CONFIG)
message("Found SDL3 ${SDL3_VERSION}: ${SDL3_DIR}")

if (WIN32)
if (YOKAI_SYSTEM_Windows)
set(LIBS_ENGINE_BASE ${LIBS_ENGINE_BASE} SDL3::SDL3)
else()
set(LIBS_CLIENT ${LIBS_CLIENT} SDL3::SDL3)
Expand All @@ -703,7 +702,7 @@ if (USE_BREAKPAD)
add_definitions(-DUSE_BREAKPAD)
include_directories(${LIB_DIR}/breakpad/src)

if (WIN32)
if (YOKAI_SYSTEM_Windows)
add_library(srclibs-breakpad-common EXCLUDE_FROM_ALL ${BREAKPAD_COMMON_LIST})
add_library(srclibs-breakpad-crash_generation_server EXCLUDE_FROM_ALL ${BREAKPAD_CRASHGENERATIONSERVER_LIST})
add_library(srclibs-breakpad-exception_handler EXCLUDE_FROM_ALL ${BREAKPAD_EXCEPTIONHANDLER_LIST})
Expand Down Expand Up @@ -733,7 +732,7 @@ if (USE_BREAKPAD)
set(LIBS_ENGINE_BASE ${LIBS_ENGINE_BASE} srclibs-breakpad-exception_handler
srclibs-breakpad-crash_generation_client srclibs-breakpad-common)

elseif (LINUX)
elseif (YOKAI_SYSTEM_Linux_COMPATIBILITY)
add_library(srclibs-breakpad EXCLUDE_FROM_ALL ${BREAKPAD_LIST})
set_target_properties(srclibs-breakpad PROPERTIES POSITION_INDEPENDENT_CODE 1 FOLDER "libs")
target_compile_definitions(srclibs-breakpad PUBLIC HAVE_GETCONTEXT=1)
Expand All @@ -748,7 +747,7 @@ option(PREFER_EXTERNAL_LIBS "Tries to use system libs where possible." ON)

macro(prefer_package LIB_NAME LIB_CMAKE)
if (NOT ${LIB_NAME}_FOUND)
if (PREFER_EXTERNAL_LIBS AND NOT NACL)
if (PREFER_EXTERNAL_LIBS AND NOT YOKAI_SYSTEM_NaCl)
find_package(${LIB_NAME})

if (NOT ${LIB_NAME}_FOUND)
Expand Down Expand Up @@ -837,9 +836,9 @@ macro(AddApplicationInternal Target Executable)
# Append Windows specific manifests.
# Adding the .manifest as a source works better for MSVC, but it has no
# effect for MinGW (https://gitlab.kitware.com/cmake/cmake/-/issues/23244).
if (MINGW)
if (YOKAI_CXX_COMPILER_MinGW)
target_sources(${Target} PRIVATE ${ENGINE_DIR}/sys/windows-resource/manifest.rc)
elseif (WIN32)
elseif (YOKAI_CXX_COMPILER_MSVC)
target_sources(${Target} PRIVATE ${ENGINE_DIR}/sys/windows-resource/supported-os.manifest)
endif()

Expand Down Expand Up @@ -878,9 +877,9 @@ function(AddApplication)
ADD_PRECOMPILED_HEADER(${A_Target}-objects)
endfunction()

daemon_write_buildinfo("Engine")
yokai_write_buildinfo("Engine")

if (NOT NACL)
if (NOT YOKAI_SYSTEM_NaCl)
add_library(engine-lib EXCLUDE_FROM_ALL ${PCH_FILE} ${BUILDINFOLIST} ${COMMONLIST} ${ENGINELIST})
target_link_libraries(engine-lib ${LIBS_BASE} ${LIBS_ENGINE_BASE} ${CPP23SupportLibrary})
set_property(TARGET engine-lib APPEND PROPERTY COMPILE_DEFINITIONS BUILD_ENGINE)
Expand Down Expand Up @@ -931,9 +930,9 @@ if (BUILD_CLIENT)
)

# Generate GLSL include files.
daemon_embed_files("EngineShaders" "${GLSL_EMBED_DIR}" "${GLSL_EMBED_LIST}" "TEXT" "client-objects")
yokai_embed_files("EngineShaders" "${GLSL_EMBED_DIR}" "${GLSL_EMBED_LIST}" "TEXT" "client-objects")

daemon_embed_files(ConsoleFont "${CMAKE_CURRENT_SOURCE_DIR}/libs/unifont" unifont.otf BINARY client-objects)
yokai_embed_files(ConsoleFont "${CMAKE_CURRENT_SOURCE_DIR}/libs/unifont" unifont.otf BINARY client-objects)
endif()

if (BUILD_SERVER)
Expand Down Expand Up @@ -979,13 +978,13 @@ if (DEPS_DIR AND HAS_NACL AND (BUILD_CLIENT OR BUILD_TTY_CLIENT OR BUILD_SERVER

add_custom_command(TARGET runtime_deps PRE_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${DEPS_DIR}/irt_core-${NACL_ARCH}.nexe
${FULL_OUTPUT_DIR}/irt_core-${NACL_ARCH}.nexe
${DEPS_DIR}/irt_core-${YOKAI_NACL_ARCH_NAME}.nexe
${FULL_OUTPUT_DIR}/irt_core-${YOKAI_NACL_ARCH_NAME}.nexe
)

# Linux uses a bootstrap program to reserve address space
if (LINUX OR FREEBSD)
if (ARCH STREQUAL "arm64")
if (YOKAI_SYSTEM_Unix_COMPATIBILITY)
if (YOKAI_ARCH_arm64)
add_executable(nacl_helper_bootstrap-armhf tools/nacl_helper_bootstrap-armhf/nacl_helper_bootstrap-armhf.cpp)
add_dependencies(runtime_deps nacl_helper_bootstrap-armhf)

Expand All @@ -1009,7 +1008,7 @@ if (DEPS_DIR AND HAS_NACL AND (BUILD_CLIENT OR BUILD_TTY_CLIENT OR BUILD_SERVER
endif()

# Win32 requires nacl_loader_amd64.exe in order to run on Win64
if (WIN32 AND ARCH STREQUAL i686)
if (YOKAI_SYSTEM_Windows AND YOKAI_ARCH_i686)
add_custom_command(TARGET runtime_deps PRE_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${DEPS_DIR}/nacl_loader-amd64${CMAKE_EXECUTABLE_SUFFIX}
Expand All @@ -1023,7 +1022,7 @@ if (DEPS_DIR AND HAS_NACL AND (BUILD_CLIENT OR BUILD_TTY_CLIENT OR BUILD_SERVER
endif()

# Mac requires some libraries from external_deps
if (APPLE)
if (YOKAI_SYSTEM_macOS)
file(GLOB RUNTIME_FRAMEWORKS ${DEPS_DIR}/lib/*.framework)
foreach(RUNTIME_FRAMEWORK ${RUNTIME_FRAMEWORKS})
get_filename_component(RUNTIME_FRAMEWORK_NAME ${RUNTIME_FRAMEWORK} NAME)
Expand All @@ -1045,7 +1044,7 @@ if (DEPS_DIR AND HAS_NACL AND (BUILD_CLIENT OR BUILD_TTY_CLIENT OR BUILD_SERVER
endif()

# Windows requires some libraries from external_deps
if (WIN32)
if (YOKAI_SYSTEM_Windows)
file(GLOB RUNTIME_LIBS ${DEPS_DIR}/bin/*.dll ${DEPS_DIR}/SDL3/lib/*/SDL3.dll)
foreach(RUNTIME_LIB ${RUNTIME_LIBS})
add_custom_command(TARGET runtime_deps PRE_BUILD
Expand Down
Loading
Loading