fixing CMakeConfigDeps escaping

conan/tools/cmake/cmakedeps/templates/target_data.py

@@ -6,6 +6,7 @@
 from conan.tools.cmake.cmakedeps.templates import CMakeDepsFileTemplate
 from conan.errors import ConanException
 from conan.internal.api.install.generators import relativize_path
+from conan.tools.cmake.utils import cmake_escape_value
 
 """
 
@@ -296,15 +297,12 @@ def join_paths(paths):
 
         def join_flags(separator, values):
             # Flags have to be escaped
-            ret = separator.join(v.replace('\\', '\\\\').replace('$', '\\$').replace('"', '\\"')
-                                 for v in values)
+            ret = separator.join(cmake_escape_value(v) for v in values)
             return ret
 
         def join_defines(values, prefix=""):
             # Defines have to be escaped, included spaces
-            return "\n\t\t\t".join('"%s%s"' % (prefix, v.replace('\\', '\\\\').replace('$', '\\$').
-                                   replace('"', '\\"'))
-                                   for v in values)
+            return "\n\t\t\t".join('"%s%s"' % (prefix, cmake_escape_value(v)) for v in values)
 
         self.include_paths = join_paths(cpp_info.includedirs)
         self.lib_paths = join_paths(cpp_info.libdirs)

conan/tools/cmake/cmakedeps2/target_configuration.py

@@ -8,6 +8,7 @@
 from conan.internal.api.install.generators import relativize_path
 from conan.internal.model.pkg_type import PackageType
 from conan.internal.graph.graph import CONTEXT_BUILD, CONTEXT_HOST
+from conan.tools.cmake.utils import cmake_escape_value
 
 
 class TargetConfigurationTemplate2:
@@ -181,8 +182,7 @@ def _get_cmake_lib(self, info, components, pkg_folder, pkg_folder_var):
                                for i in info.includedirs) if info.includedirs else ""
         requires = self._requires(info, components)
         assert isinstance(requires, dict)
-        defines = " ".join(info.defines)
-        # TODO: Missing escaping?
+        defines = " ".join(cmake_escape_value(f) for f in info.defines)
         # FIXME: Filter by lib traits!!!!!
         if not self._require.headers:  # If not depending on headers, paths and
             includedirs = defines = None
@@ -191,10 +191,10 @@ def _get_cmake_lib(self, info, components, pkg_folder, pkg_folder_var):
                   "includedirs": includedirs,
                   "defines": defines,
                   "requires": requires,
-                  "cxxflags": " ".join(info.cxxflags),
-                  "cflags": " ".join(info.cflags),
-                  "sharedlinkflags": " ".join(info.sharedlinkflags),
-                  "exelinkflags": " ".join(info.exelinkflags),
+                  "cxxflags": " ".join(cmake_escape_value(f) for f in info.cxxflags),
+                  "cflags": " ".join(cmake_escape_value(f) for f in info.cflags),
+                  "sharedlinkflags": " ".join(cmake_escape_value(v) for v in info.sharedlinkflags),
+                  "exelinkflags": " ".join(cmake_escape_value(v) for v in info.exelinkflags),
                   "system_libs": " ".join(info.system_libs),
                   "sources": " ".join(sources)
         }
@@ -306,11 +306,6 @@ def escape(p_):
             return escape(p)
         return f"${{{pkg_folder_var}}}/{escape(p)}"
 
-    @staticmethod
-    def _escape_cmake_string(values):
-        return " ".join(v.replace("\\", "\\\\").replace('$', '\\$').replace('"', '\\"')
-                        for v in values)
-
     @property
     def _template(self):
         # TODO: CMake 3.24: Apple Frameworks: https://cmake.org/cmake/help/latest/manual/cmake-generator-expressions.7.html#genex:LINK_LIBRARY

conan/tools/cmake/utils.py

@@ -39,3 +39,7 @@ def parse_extra_variable(source, key, value):
             return var_value
     raise ConanException(f'{source} "{key}" has invalid type. Allowed types: str, int, float, dict,'
                          f' got {type(value)}')
+
+
+def cmake_escape_value(v):
+    return v.replace('\\', '\\\\').replace('$', '\\$').replace('"', '\\"')