Revert commit rXXXXXX,Cutting cmake conditions from cpp code

73244acf64d539c90a8a5935440fe581fce4f251

2 files changed, 4 insertions, 16 deletions

diff --git a/build/export_generators/hardcoded-cmake/common_cmake_lists.jinja b/build/export_generators/hardcoded-cmake/common_cmake_lists.jinja
deleted file mode 100644
index 0799708dbd..0000000000
--- a/build/export_generators/hardcoded-cmake/common_cmake_lists.jinja
+++ /dev/null
@@ -1,9 +0,0 @@
-
-{% include '[generator]/disclaimer.jinja' -%}
-{% for i in range(platform_names|length) %}
-{% if i != 0 %}else{% endif %}if ({{ platforms[platform_names[i]] }})
-  include({{ platform_cmakelists[i] }})
-{%- endfor %}
-{% if platform_names|length > 0 -%}
-endif()
-{% endif -%}
diff --git a/build/export_generators/hardcoded-cmake/root_cmake_lists.jinja b/build/export_generators/hardcoded-cmake/root_cmake_lists.jinja
index 64d5b2cc26..5c9e735ec3 100644
--- a/build/export_generators/hardcoded-cmake/root_cmake_lists.jinja
+++ b/build/export_generators/hardcoded-cmake/root_cmake_lists.jinja
@@ -39,10 +39,7 @@ else()
       CONF "tools.cmake.cmaketoolchain:generator=${CMAKE_GENERATOR}"
   )
 endif(){% endif %}
-{% for i in range(platform_names|length) %}
-{% if i != 0 %}else{% endif %}if ({{ platforms[platform_names[i]] }})
-  include({{ platform_cmakelists[i] }})
-{%- endfor %}
-{% if platform_names|length > 0 -%}
-endif()
-{% endif -%}
+{% for i in range(platform_flags|length) %}
+{% if i != 0 %}else{% endif %}if ({{ platform_flags[i] }})
+  include({{ platform_cmakelists[i] }}){%endfor%}
+{% if platform_flags|length > 0%}endif(){% endif %}