Conan2 fixes in templates

Conan2 fixes
757ad7f67ce9e75f5df4102a59286867386c6ef4

build/export_generators/cmake/conan_imports.jinja

@@ -7,25 +7,25 @@
 {%-     set mask = srcdir_and_mask[1]|trim -%}
 {%-     if use_conan2 -%}
 {%-         if "bin" in srcdir %}
-            for bindir in dep.cpp_info.bindirs:
+            {{ shift }}for bindir in dep.cpp_info.bindirs:
                 {{ shift }}copy(self, pattern="{{ mask }}", src=bindir, dst=self.build_folder + "../../../../{{ dstdir }}")
 {%-         elif "res" in srcdir %}
-            for resdir in dep.cpp_info.resdirs:
+            {{ shift }}for resdir in dep.cpp_info.resdirs:
                 {{ shift }}copy(self, pattern="{{ mask }}", src=resdir, dst=self.build_folder + "../../../../{{ dstdir }}")
 {%-         elif "build" in srcdir %}
-            for builddir in dep.cpp_info.builddirs:
+            {{ shift }}for builddir in dep.cpp_info.builddirs:
                 {{ shift }}copy(self, pattern="{{ mask }}", src=builddir, dst=self.build_folder + "../../../../{{ dstdir }}")
 {%-         elif ("src" in srcdir) or ("source" in srcdir) %}
-            for srcdir in dep.cpp_info.srcdirs:
+            {{ shift }}for srcdir in dep.cpp_info.srcdirs:
                 {{ shift }}copy(self, pattern="{{ mask }}", src=srcdir, dst=self.build_folder + "../../../../{{ dstdir }}")
 {%-         elif "lib" in srcdir %}
-            for libdir in dep.cpp_info.libdirs:
+            {{ shift }}for libdir in dep.cpp_info.libdirs:
                 {{ shift }}copy(self, pattern="{{ mask }}", src=libdir, dst=self.build_folder + "../../../../{{ dstdir }}")
 {%-         elif "include" in srcdir %}
-            for includedir in dep.cpp_info.includedirs:
+            {{ shift }}for includedir in dep.cpp_info.includedirs:
                 {{ shift }}copy(self, pattern="{{ mask }}", src=includedir, dst=self.build_folder + "../../../../{{ dstdir }}")
 {%-         elif "frame" in srcdir %}
-            for framedir in dep.cpp_info.frameworkdirs:
+            {{ shift }}for framedir in dep.cpp_info.frameworkdirs:
                 {{ shift }}copy(self, pattern="{{ mask }}", src=framedir, dst=self.build_folder + "../../../../{{ dstdir }}")
 {%-         endif -%}
 {%-     else %}

build/export_generators/cmake/conanfile.py.jinja

@@ -71,7 +71,7 @@ class App(ConanFile):
         CMakeDeps(self).generate()
         CMakeToolchain(self).generate()
 {%-     for conan_generator in conan.generators %}
-            {{ conan_generator }}(self).generate()
+        {{ conan_generator }}(self).generate()
 {%-     endfor %}
 
         for dep in self.dependencies.values():
@@ -83,13 +83,13 @@ class App(ConanFile):
 {%-         if (has_conan_os_depends_imports) -%}
 {%-             for conan_os_depend in conan.os_depends|selectattr('imports') %}
 {%-                 if (conan_os_depend.imports|length) %}
-                if self.settings.os == "{{ conan_os_depend.os }}":
+            if self.settings.os == "{{ conan_os_depend.os }}":
 {%-                     set conan_imports = conan_os_depend.imports -%}
 {%-                     set shift = "    " -%}
 {%-                     include "[generator]/conan_imports.jinja" -%}
 {%-                 endif -%}
 {%-             endfor -%}
-{%-         endif -%}
+{%-         endif %}
 
     def layout(self):
         cmake_layout(self)