Moved extra_variable from GenericSystemBlock to new block which will be executed later

Author: perseoGI

conan/tools/cmake/toolchain/blocks.py

@@ -795,11 +795,6 @@ class GenericSystemBlock(Block):
         message(STATUS "Conan toolchain: CMAKE_GENERATOR_TOOLSET={{ toolset }}")
         set(CMAKE_GENERATOR_TOOLSET "{{ toolset }}" CACHE STRING "" FORCE)
         {% endif %}
-        {% if extra_variables %}
-        {% for key, value in extra_variables.items() %}
-        set({{ key }} "{{ value }}")
-        {% endfor %}
-        {% endif %}
         """)
 
     @staticmethod
@@ -960,19 +955,30 @@ def context(self):
         result = self._get_winsdk_version(system_version, generator_platform)
         system_version, winsdk_version, gen_platform_sdk_version = result
 
-        # Reading configuration from "tools.cmake.cmaketoolchain:extra_variables"
-        extra_variables = self._conanfile.conf.get("tools.cmake.cmaketoolchain:extra_variables", default={}, check_type=dict)
-
         return {"toolset": toolset,
                 "generator_platform": generator_platform,
                 "cmake_system_name": system_name,
                 "cmake_system_version": system_version,
                 "cmake_system_processor": system_processor,
                 "cmake_sysroot": cmake_sysroot,
                 "winsdk_version": winsdk_version,
-                "gen_platform_sdk_version": gen_platform_sdk_version,
-                "extra_variables": extra_variables}
+                "gen_platform_sdk_version": gen_platform_sdk_version}
 
+class ExtraVariablesBlock(Block):
+    template = textwrap.dedent(r"""
+        {% if extra_variables %}
+        {% for key, value in extra_variables.items() %}
+        set({{ key }} "{{ value }}")
+        {% endfor %}
+        {% endif %}
+    """)
+
+    def context(self):
+        # Reading configuration from "tools.cmake.cmaketoolchain:extra_variables"
+        extra_variables = self._conanfile.conf.get("tools.cmake.cmaketoolchain:extra_variables", default={}, check_type=dict)
+
+        # Map the possible languages
+        return {"extra_variables": extra_variables}
 
 class OutputDirsBlock(Block):
 

conan/tools/cmake/toolchain/toolchain.py

@@ -9,7 +9,7 @@
 from conan.tools.build import use_win_mingw
 from conan.tools.cmake.presets import write_cmake_presets
 from conan.tools.cmake.toolchain import CONAN_TOOLCHAIN_FILENAME
-from conan.tools.cmake.toolchain.blocks import ToolchainBlocks, UserToolchain, GenericSystemBlock, \
+from conan.tools.cmake.toolchain.blocks import ExtraVariablesBlock, ToolchainBlocks, UserToolchain, GenericSystemBlock, \
     AndroidSystemBlock, AppleSystemBlock, FPicBlock, ArchitectureBlock, GLibCXXBlock, VSRuntimeBlock, \
     CppStdBlock, ParallelBlock, CMakeFlagsInitBlock, TryCompileBlock, FindFiles, PkgConfigBlock, \
     SkipRPath, SharedLibBock, OutputDirsBlock, ExtraFlagsBlock, CompilersBlock, LinkerScriptsBlock, \
@@ -153,6 +153,7 @@ def __init__(self, conanfile, generator=None):
         self.blocks = ToolchainBlocks(self._conanfile, self,
                                       [("user_toolchain", UserToolchain),
                                        ("generic_system", GenericSystemBlock),
+                                       ("extra_variables", ExtraVariablesBlock),
                                        ("compilers", CompilersBlock),
                                        ("android_system", AndroidSystemBlock),
                                        ("apple_system", AppleSystemBlock),