Moved extra variables just before the try_compile block.

This will allow users to re-define variables

Author: perseoGI

conan/tools/cmake/toolchain/blocks.py

@@ -1007,7 +1007,7 @@ class ExtraVariablesBlock(Block):
     template = textwrap.dedent(r"""
         {% if extra_variables %}
         {% for key, value in extra_variables.items() %}
-        set({{ key }} "{{ value }}")
+        set({{ key }} {{ value }})
         {% endfor %}
         {% endif %}
     """)

conan/tools/cmake/toolchain/toolchain.py

@@ -153,7 +153,6 @@ 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),
@@ -167,6 +166,7 @@ def __init__(self, conanfile, generator=None):
                                        ("parallel", ParallelBlock),
                                        ("extra_flags", ExtraFlagsBlock),
                                        ("cmake_flags_init", CMakeFlagsInitBlock),
+                                       ("extra_variables", ExtraVariablesBlock),
                                        ("try_compile", TryCompileBlock),
                                        ("find_paths", FindFiles),
                                        ("pkg_config", PkgConfigBlock),

conans/model/conf.py

@@ -73,7 +73,7 @@
     "tools.cmake.cmaketoolchain:toolset_arch": "Toolset architecture to be used as part of CMAKE_GENERATOR_TOOLSET in CMakeToolchain",
     "tools.cmake.cmaketoolchain:toolset_cuda": "(Experimental) Path to a CUDA toolset to use, or version if installed at the system level",
     "tools.cmake.cmaketoolchain:presets_environment": "String to define wether to add or not the environment section to the CMake presets. Empty by default, will generate the environment section in CMakePresets. Can take values: 'disabled'.",
-    "tools.cmake.cmaketoolchain:extra_variables": "Dictionary with variables to be injected in CMakeToolchain",
+    "tools.cmake.cmaketoolchain:extra_variables": "Dictionary with variables to be injected in CMakeToolchain (potential override of CMakeToolchain defined variables)",
     "tools.cmake.cmake_layout:build_folder_vars": "Settings and Options that will produce a different build folder and different CMake presets names",
     "tools.cmake.cmake_layout:build_folder": "(Experimental) Allow configuring the base folder of the build for local builds",
     "tools.cmake.cmake_layout:test_folder": "(Experimental) Allow configuring the base folder of the build for test_package",

conans/test/integration/toolchains/cmake/test_cmaketoolchain.py

@@ -1589,15 +1589,18 @@ def test_toolchain_extra_variables():
     client.save({"conanfile.txt": "[generators]\nCMakeToolchain",
                  "windows": windows_profile})
 
-    # Test passing extra_variables from profile
+    # Test passing extra_variables from pro ile
     client.run("install . --profile:build=windows --profile:host=windows")
     toolchain = client.load("conan_toolchain.cmake")
     assert 'set(CMAKE_GENERATOR_INSTANCE "${GENERATOR_INSTANCE}/buildTools/")' in toolchain
     assert 'set(FOO 42 CACHE)' in toolchain
 
     # Test input from command line passing dict between doble quotes
-
-    client.run("install . -c tools.cmake.cmaketoolchain:extra_variables=\"{'CMAKE_GENERATOR_INSTANCE': '\"\${GENERATOR_INSTANCE}/buildTools/\"', 'FOO': '42 CACHE'}\"")
+    client.run(textwrap.dedent(r"""
+        install . -c tools.cmake.cmaketoolchain:extra_variables="{'CMAKE_GENERATOR_INSTANCE': '\"${GENERATOR_INSTANCE}/buildTools/\"', 'FOO': '42 CACHE'}"
+    """)
+    )
     toolchain = client.load("conan_toolchain.cmake")
+    print(toolchain)
     assert 'set(CMAKE_GENERATOR_INSTANCE "${GENERATOR_INSTANCE}/buildTools/")' in toolchain
     assert 'set(FOO 42 CACHE)' in toolchain