From 2164da0ae6a575df5608698df4026f7eae230ad2 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 8 Apr 2025 10:52:28 -0400 Subject: [PATCH] Help: Document CMAKE_OSX_SYSROOT default change in 4.0 In commit 7b19531291 (macOS: Do not pass any SDK/-isysroot to compilers by default, 2024-11-06, v4.0.0-rc1~511^2) we forgot to update the documentation of `CMAKE_OSX_SYSROOT`. Fixes: #26846 --- Help/release/4.0.rst | 4 ++-- Help/variable/CMAKE_OSX_SYSROOT.rst | 11 ++++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Help/release/4.0.rst b/Help/release/4.0.rst index f4886f28b5..c2f5c5419f 100644 --- a/Help/release/4.0.rst +++ b/Help/release/4.0.rst @@ -232,8 +232,8 @@ Other Changes * Builds targeting macOS no longer choose any SDK or pass an ``-isysroot`` flag to the compiler by default. Instead, compilers are expected to choose a default macOS SDK on their own. In order to use a compiler that - does not do this, users must now specify ``-DCMAKE_OSX_SYSROOT=macosx`` - when configuring their build. + does not do this, users must now specify :variable:`CMAKE_OSX_SYSROOT` + when configuring their build, e.g., ``-DCMAKE_OSX_SYSROOT=macosx``. * On AIX, ``SHARED`` library targets now produce a shared library archive by default. See policy :policy:`CMP0182`. diff --git a/Help/variable/CMAKE_OSX_SYSROOT.rst b/Help/variable/CMAKE_OSX_SYSROOT.rst index db9fccdd1f..db0d057388 100644 --- a/Help/variable/CMAKE_OSX_SYSROOT.rst +++ b/Help/variable/CMAKE_OSX_SYSROOT.rst @@ -6,8 +6,13 @@ CMake uses this value to compute the value of the ``-isysroot`` flag or equivalent and to help the ``find_*`` commands locate files in the SDK. -If not set explicitly the value is initialized by the ``SDKROOT`` -environment variable, if set, and otherwise computed based on the -:variable:`CMAKE_OSX_DEPLOYMENT_TARGET` or the host platform. +If not set explicitly, the value is initialized by the ``SDKROOT`` +environment variable, if set. Otherwise, the value defaults to empty, +so no explicit ``-isysroot`` flag is passed, and the compiler's default +sysroot is used. + +.. versionchanged:: 4.0 + The default is now empty. Previously a default was computed based on + the :variable:`CMAKE_OSX_DEPLOYMENT_TARGET` or the host platform. .. include:: CMAKE_OSX_VARIABLE.txt