From f98c974a0de833b14def482d512cb5126d436f57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joshua=20Vanda=C3=ABle?= Date: Tue, 14 Jul 2026 16:09:41 +0200 Subject: [PATCH 1/3] CMake: Update compiler version checking We now only show the minimum version of the compiler being used to build Dolphin instead of all supported compilers. --- CMakeLists.txt | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f54df6b927..8dc8606253 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,24 +33,18 @@ if (COMPILER STREQUAL "GNU") set(COMPILER "GCC") # prefer printing GCC instead of GNU endif() -# Enforce minimum compiler versions that support the c++23 features we use -set (GCC_min_version 12) -set (Clang_min_version 15) -set (AppleClang_min_version 14.0.3) -set (min_xcode_version "14.3") # corresponding xcode version for AppleClang_min_version -set (MSVC_min_version 19.32) -set (min_vs_version "2022 17.2.3") # corresponding Visual Studio version for MSVC_min_version +# Enforce minimum compiler versions that support the C++23 features we use +set(GCC_min_version 12) +set(Clang_min_version 15) +set(AppleClang_min_version 14.0.3) +set(MSVC_min_version 19.32) message(STATUS "Using ${COMPILER} ${CMAKE_CXX_COMPILER_VERSION}") -if ("-" STREQUAL "${${COMPILER}_min_version}-") +if(NOT DEFINED ${COMPILER}_min_version) message(WARNING "Unknown compiler ${COMPILER}, assuming it is new enough") -else() - if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${${COMPILER}_min_version}) - message(FATAL_ERROR "Requires GCC ${GCC_min_version}, Clang ${Clang_min_version}," - " AppleClang ${AppleClang_min_version} (Xcode ${min_xcode_version})," - " or MSVC ${MSVC_min_version} (Visual Studio ${min_vs_version}) or higher") - endif() +elseif(CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${${COMPILER}_min_version}) + message(FATAL_ERROR "Requires ${COMPILER} ${${COMPILER}_min_version} or higher") endif() # Name of the Dolphin distributor. If you redistribute Dolphin builds (forks, From 13238340ae77350f7f7bb13f1e93e52afc450afe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joshua=20Vanda=C3=ABle?= Date: Tue, 14 Jul 2026 16:37:31 +0200 Subject: [PATCH 2/3] CMake: Enforce minimum toolset versions --- CMake/DolphinLibraryTools.cmake | 10 ++++++++++ CMakeLists.txt | 35 +++++++++++++++++++-------------- 2 files changed, 30 insertions(+), 15 deletions(-) diff --git a/CMake/DolphinLibraryTools.cmake b/CMake/DolphinLibraryTools.cmake index bedba9dcbd..7d62966fc7 100644 --- a/CMake/DolphinLibraryTools.cmake +++ b/CMake/DolphinLibraryTools.cmake @@ -138,3 +138,13 @@ function(dolphin_find_optional_system_library_pkgconfig library search alias bun dolphin_add_bundled_library(${library} ${use_system} ${bundled_path}) endif() endfunction() + +function(dolphin_check_toolset_version LABEL VERSION_VAR MIN_VERSION) + if(NOT DEFINED ${VERSION_VAR}) + return() + endif() + message(STATUS "Using ${LABEL} ${${VERSION_VAR}}") + if(${VERSION_VAR} VERSION_LESS ${MIN_VERSION}) + message(FATAL_ERROR "Requires ${LABEL} ${MIN_VERSION} or higher") + endif() +endfunction() diff --git a/CMakeLists.txt b/CMakeLists.txt index 8dc8606253..389e8ae7ee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,6 +19,18 @@ set(CMAKE_CXX_SCAN_FOR_MODULES OFF) project(dolphin-emu) +list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMake) + +# Support functions +include(CheckAndAddFlag) +include(CheckCCompilerFlag) +include(CheckSymbolExists) +include(DolphinCompileDefinitions) +include(DolphinDisableWarningsMSVC) +include(DolphinLibraryTools) +include(GNUInstallDirs) +include(RemoveCompileFlag) + # When using the Visual Studio generator, only show our targets and not the ones from Externals. set_property(DIRECTORY ${PROJECT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT dolphin-emu) @@ -33,12 +45,19 @@ if (COMPILER STREQUAL "GNU") set(COMPILER "GCC") # prefer printing GCC instead of GNU endif() -# Enforce minimum compiler versions that support the C++23 features we use +# Minimum required versions +# Toolsets +set(Xcode_min_version 14.3) +set(MSVC_toolset_min_version 143) +# Compilers set(GCC_min_version 12) set(Clang_min_version 15) set(AppleClang_min_version 14.0.3) set(MSVC_min_version 19.32) +dolphin_check_toolset_version("Xcode" XCODE_VERSION ${Xcode_min_version}) +dolphin_check_toolset_version("MSVC Toolset" MSVC_TOOLSET_VERSION ${MSVC_toolset_min_version}) + message(STATUS "Using ${COMPILER} ${CMAKE_CXX_COMPILER_VERSION}") if(NOT DEFINED ${COMPILER}_min_version) @@ -136,20 +155,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux") endif() endif() -list(APPEND CMAKE_MODULE_PATH - ${CMAKE_CURRENT_SOURCE_DIR}/CMake -) - -# Support functions -include(CheckAndAddFlag) -include(CheckCCompilerFlag) -include(CheckSymbolExists) -include(DolphinCompileDefinitions) -include(DolphinDisableWarningsMSVC) -include(DolphinLibraryTools) -include(GNUInstallDirs) -include(RemoveCompileFlag) - # Enable folders for IDE set_property(GLOBAL PROPERTY USE_FOLDERS ON) From 24361f49d1f797e1662af4a5d45447cafbf25fa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joshua=20Vanda=C3=ABle?= Date: Tue, 14 Jul 2026 17:58:52 +0200 Subject: [PATCH 3/3] CMake: Enforce minimum stdlib versions --- CMake/DolphinLibraryTools.cmake | 21 +++++++++++++++++++++ CMakeLists.txt | 9 +++++++++ 2 files changed, 30 insertions(+) diff --git a/CMake/DolphinLibraryTools.cmake b/CMake/DolphinLibraryTools.cmake index 7d62966fc7..99f5f7f8f4 100644 --- a/CMake/DolphinLibraryTools.cmake +++ b/CMake/DolphinLibraryTools.cmake @@ -1,3 +1,6 @@ +include(CheckCXXSourceCompiles) +include(CheckCXXSymbolExists) + # like add_library(new ALIAS old) but avoids add_library cannot create ALIAS target "new" because target "old" is imported but not globally visible. on older cmake # This can be replaced with a direct alias call once our minimum is cmake 3.18 function(dolphin_alias_library new old) @@ -148,3 +151,21 @@ function(dolphin_check_toolset_version LABEL VERSION_VAR MIN_VERSION) message(FATAL_ERROR "Requires ${LABEL} ${MIN_VERSION} or higher") endif() endfunction() + + +function(dolphin_check_std_version LABEL VERSION_MACRO MIN_VERSION) + check_cxx_symbol_exists(${VERSION_MACRO} version IS_${LABEL}) + if(NOT IS_${LABEL}) + return() + endif() + check_cxx_source_compiles([[ + #include + #if ${VERSION_MACRO} < ${MIN_VERSION} + #error + #endif + int main(){} + ]] HAS_MINIMUM_${LABEL}) + if(NOT HAS_MINIMUM_${LABEL}) + message(FATAL_ERROR "Requires ${LABEL} ${MIN_VERSION} or higher") + endif() +endfunction() diff --git a/CMakeLists.txt b/CMakeLists.txt index 389e8ae7ee..7258caeec8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,6 +54,9 @@ set(GCC_min_version 12) set(Clang_min_version 15) set(AppleClang_min_version 14.0.3) set(MSVC_min_version 19.32) +# Standard libraries +set(libstdc++_min_version 12) # This should match GCC_min_version's major version. +set(libc++_min_version 150000) # This should match Clang_min_version in the format "xxyyzz" instead of "xx.yy.zz" dolphin_check_toolset_version("Xcode" XCODE_VERSION ${Xcode_min_version}) dolphin_check_toolset_version("MSVC Toolset" MSVC_TOOLSET_VERSION ${MSVC_toolset_min_version}) @@ -66,6 +69,12 @@ elseif(CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${${COMPILER}_min_version}) message(FATAL_ERROR "Requires ${COMPILER} ${${COMPILER}_min_version} or higher") endif() +# libstdc++ is almost always used on Linux, even when using clang as the compiler. +# libc++ is used on the likes of Android, Apple devices, FreeBSD, and a few (very) rare Linux distros like Chimera Linux. +# Windows uses its own standard library named STL, which we check as part of the toolset above. (outside of MinGW which can use either libstdc++ or libc++) +dolphin_check_std_version("GNU_libstdc++" _GLIBCXX_RELEASE ${libstdc++_min_version}) +dolphin_check_std_version("LLVM_libc++" _LIBCPP_VERSION ${libc++_min_version}) + # Name of the Dolphin distributor. If you redistribute Dolphin builds (forks, # unofficial builds) please consider identifying your distribution with a # unique name here.