allow integers as CMakeToolchain.preprocessor_definitions (#8645)

* allow integers as CMakeToolchain.preprocessor_definitions

* fix test

* fix test

* ordered dicts

conan/tools/cmake/base.py

@@ -1,6 +1,7 @@
 import textwrap
-from collections import OrderedDict, defaultdict
+from collections import OrderedDict
 
+import six
 from jinja2 import DictLoader, Environment
 
 from conans.util.files import save
@@ -17,17 +18,26 @@ def __getattribute__(self, config):
         try:
             return super(Variables, self).__getattribute__(config)
         except AttributeError:
-            return self._configuration_types.setdefault(config, dict())
+            return self._configuration_types.setdefault(config, OrderedDict())
 
     @property
     def configuration_types(self):
         # Reverse index for the configuration_types variables
-        ret = defaultdict(list)
+        ret = OrderedDict()
         for conf, definitions in self._configuration_types.items():
             for k, v in definitions.items():
-                ret[k].append((conf, v))
+                ret.setdefault(k, []).append((conf, v))
         return ret
 
+    def quote_preprocessor_strings(self):
+        for key, var in self.items():
+            if isinstance(var, six.string_types):
+                self[key] = '"{}"'.format(var)
+        for config, data in self._configuration_types.items():
+            for key, var in data.items():
+                if isinstance(var, six.string_types):
+                    data[key] = '"{}"'.format(var)
+
 
 class CMakeToolchainBase(object):
     filename = "conan_toolchain.cmake"
@@ -38,7 +48,7 @@ class CMakeToolchainBase(object):
                 {%- set genexpr = namespace(str='') %}
                 {%- for conf, value in values -%}
                     {%- set genexpr.str = genexpr.str +
-                                          '$<IF:$<CONFIG:' + conf + '>,"' + value|string + '",' %}
+                                          '$<IF:$<CONFIG:' + conf + '>,' + value|string + ',' %}
                     {%- if loop.last %}{% set genexpr.str = genexpr.str + '""' -%}{%- endif -%}
                 {%- endfor -%}
                 {% for i in range(values|count) %}{%- set genexpr.str = genexpr.str + '>' %}
@@ -95,8 +105,8 @@ class CMakeToolchainBase(object):
         {% endblock %}
 
         {% if shared_libs -%}
-            message(STATUS "Conan toolchain: Setting BUILD_SHARED_LIBS= {{ shared_libs }}")
-            set(BUILD_SHARED_LIBS {{ shared_libs }})
+        message(STATUS "Conan toolchain: Setting BUILD_SHARED_LIBS= {{ shared_libs }}")
+        set(BUILD_SHARED_LIBS {{ shared_libs }})
         {%- endif %}
 
         {% if parallel -%}
@@ -125,7 +135,7 @@ class CMakeToolchainBase(object):
         # Preprocessor definitions
         {% for it, value in preprocessor_definitions.items() -%}
         # add_compile_definitions only works in cmake >= 3.12
-        add_definitions(-D{{ it }}="{{ value }}")
+        add_definitions(-D{{ it }}={{ value }})
         {%- endfor %}
         # Preprocessor definitions per configuration
         {{ toolchain_macros.iterate_configs(preprocessor_definitions_config,
@@ -152,6 +162,8 @@ def _get_templates(self):
     def _get_template_context_data(self):
         """ Returns dict, the context for the '_template_toolchain'
         """
+        self.preprocessor_definitions.quote_preprocessor_strings()
+
         ctxt_toolchain = {
             "variables": self.variables,
             "variables_config": self.variables.configuration_types,

conans/test/functional/toolchains/cmake/test_cmake.py

@@ -36,8 +36,11 @@ def generate(self):
                 tc.variables.debug["MYVAR2_CONFIG"] = "MYVAR2_DEBUG"
                 tc.variables.release["MYVAR2_CONFIG"] = "MYVAR2_RELEASE"
                 tc.preprocessor_definitions["MYDEFINE"] = "MYDEF_VALUE"
+                tc.preprocessor_definitions["MYDEFINEINT"] = 42
                 tc.preprocessor_definitions.debug["MYDEFINE_CONFIG"] = "MYDEF_DEBUG"
                 tc.preprocessor_definitions.release["MYDEFINE_CONFIG"] = "MYDEF_RELEASE"
+                tc.preprocessor_definitions.debug["MYDEFINEINT_CONFIG"] = 421
+                tc.preprocessor_definitions.release["MYDEFINEINT_CONFIG"] = 422
                 tc.generate()
 
             def build(self):
@@ -48,7 +51,8 @@ def build(self):
 
     lib_h = gen_function_h(name="app")
     lib_cpp = gen_function_cpp(name="app", msg="App", includes=["hello"], calls=["hello"],
-                               preprocessor=["MYVAR", "MYVAR_CONFIG", "MYDEFINE", "MYDEFINE_CONFIG"])
+                               preprocessor=["MYVAR", "MYVAR_CONFIG", "MYDEFINE", "MYDEFINE_CONFIG",
+                                             "MYDEFINEINT", "MYDEFINEINT_CONFIG"])
     main = gen_function_cpp(name="main", includes=["app"], calls=["app"])
 
     cmakelist = textwrap.dedent("""
@@ -83,7 +87,7 @@ def build(self):
         add_library(app_lib app_lib.cpp)
         target_link_libraries(app_lib PRIVATE hello::hello)
         target_compile_definitions(app_lib PRIVATE MYVAR="${MYVAR}")
-        target_compile_definitions(app_lib PRIVATE MYVAR_CONFIG=${MYVAR_CONFIG})
+        target_compile_definitions(app_lib PRIVATE MYVAR_CONFIG="${MYVAR_CONFIG}")
         add_executable(app app.cpp)
         target_link_libraries(app PRIVATE app_lib)
         """)
@@ -130,7 +134,9 @@ def _run_build(self, settings=None, options=None):
     def _modify_code(self):
         lib_cpp = gen_function_cpp(name="app", msg="AppImproved", includes=["hello"],
                                    calls=["hello"], preprocessor=["MYVAR", "MYVAR_CONFIG",
-                                                                  "MYDEFINE", "MYDEFINE_CONFIG"])
+                                                                  "MYDEFINE", "MYDEFINE_CONFIG",
+                                                                  "MYDEFINEINT",
+                                                                  "MYDEFINEINT_CONFIG"])
         self.client.save({"app_lib.cpp": lib_cpp})
 
         content = self.client.load("CMakeLists.txt")
@@ -158,6 +164,9 @@ def _run_app(self, build_type, bin_folder=False, msg="App", dyld_path=None):
         self.assertIn("MYVAR_CONFIG: MYVAR_%s" % build_type.upper(), self.client.out)
         self.assertIn("MYDEFINE: MYDEF_VALUE", self.client.out)
         self.assertIn("MYDEFINE_CONFIG: MYDEF_%s" % build_type.upper(), self.client.out)
+        self.assertIn("MYDEFINEINT: 42", self.client.out)
+        self.assertIn("MYDEFINEINT_CONFIG: {}".format(421 if build_type == "Debug" else 422),
+                      self.client.out)
 
 
 @pytest.mark.skipif(platform.system() != "Windows", reason="Only for windows")
@@ -236,6 +245,7 @@ def _verify_out(marker=">>"):
                        "MYVAR_CONFIG": "MYVAR_RELEASE",
                        "MYDEFINE": "MYDEF_VALUE",
                        "MYDEFINE_CONFIG": "MYDEF_RELEASE"
+
                        })
         self._run_app("Debug", bin_folder=True)
         check_exe_run(self.client.out, "main", "msvc", visual_version, "Debug", arch, cppstd,
@@ -336,9 +346,10 @@ def test_toolchain_linux(self, build_type, cppstd, arch, libcxx, shared):
         pic_str = "" if shared else "ON"
         arch_str = "-m32" if arch == "x86" else "-m64"
         cxx11_abi_str = "1" if libcxx == "libstdc++11" else "0"
-        defines = '_GLIBCXX_USE_CXX11_ABI=%s;MYDEFINE="MYDEF_VALUE";'\
-                  'MYDEFINE_CONFIG=$<IF:$<CONFIG:debug>,"MYDEF_DEBUG",'\
-                  '$<IF:$<CONFIG:release>,"MYDEF_RELEASE","">>' % cxx11_abi_str
+        defines = '_GLIBCXX_USE_CXX11_ABI=%s;MYDEFINE="MYDEF_VALUE";MYDEFINEINT=42;'\
+                  'MYDEFINE_CONFIG=$<IF:$<CONFIG:debug>,"MYDEF_DEBUG",$<IF:$<CONFIG:release>,'\
+                  '"MYDEF_RELEASE","">>;MYDEFINEINT_CONFIG=$<IF:$<CONFIG:debug>,421,'\
+                  '$<IF:$<CONFIG:release>,422,"">>' % cxx11_abi_str
         vals = {"CMAKE_CXX_STANDARD": "14",
                 "CMAKE_CXX_EXTENSIONS": extensions_str,
                 "CMAKE_BUILD_TYPE": build_type,