From ec2c54464fc8a585e2fdb3385dbab31a9676428a Mon Sep 17 00:00:00 2001 From: Juan Sanchez Date: Tue, 4 Jun 2024 15:00:37 +0200 Subject: [PATCH 1/2] add cmake_system_version note --- reference/tools/cmake/cmaketoolchain.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference/tools/cmake/cmaketoolchain.rst b/reference/tools/cmake/cmaketoolchain.rst index 623604f29836..ebda34d9bb4a 100644 --- a/reference/tools/cmake/cmaketoolchain.rst +++ b/reference/tools/cmake/cmaketoolchain.rst @@ -565,7 +565,7 @@ variables: cross-building if Android systems (that is managed by other blocks), and not 64bits to 32bits builds in x86_64, sparc and ppc systems. - ``CMAKE_SYSTEM_VERSION``: ``tools.cmake.cmaketoolchain:system_version`` conf if defined, otherwise - ``os.version`` subsetting (host) when defined + ``os.version`` subsetting (host) when defined. On Apple systems, this ``os.version`` is converted to Darwin version. - ``CMAKE_SYSTEM_PROCESSOR``: ``tools.cmake.cmaketoolchain:system_processor`` conf if defined, otherwise ``arch`` setting (host) if defined From 0b7f7620233fff775a39f295084e7840920bc4d9 Mon Sep 17 00:00:00 2001 From: Carlos Zoido Date: Tue, 4 Jun 2024 15:10:55 +0200 Subject: [PATCH 2/2] Update reference/tools/cmake/cmaketoolchain.rst --- reference/tools/cmake/cmaketoolchain.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference/tools/cmake/cmaketoolchain.rst b/reference/tools/cmake/cmaketoolchain.rst index ebda34d9bb4a..f8b5c0ccc42a 100644 --- a/reference/tools/cmake/cmaketoolchain.rst +++ b/reference/tools/cmake/cmaketoolchain.rst @@ -565,7 +565,7 @@ variables: cross-building if Android systems (that is managed by other blocks), and not 64bits to 32bits builds in x86_64, sparc and ppc systems. - ``CMAKE_SYSTEM_VERSION``: ``tools.cmake.cmaketoolchain:system_version`` conf if defined, otherwise - ``os.version`` subsetting (host) when defined. On Apple systems, this ``os.version`` is converted to Darwin version. + ``os.version`` subsetting (host) when defined. On Apple systems, this ``os.version`` is converted to the corresponding Darwin version. - ``CMAKE_SYSTEM_PROCESSOR``: ``tools.cmake.cmaketoolchain:system_processor`` conf if defined, otherwise ``arch`` setting (host) if defined