Cutting cmake conditions from cpp code

Cutting cmake conditions from cpp code

Fix issue

Support platforms spec
8f9e9bf7663b27406d971a7a7dec526ca6a0480e

2 files changed, 16 insertions, 4 deletions

diff --git a/build/export_generators/hardcoded-cmake/common_cmake_lists.jinja b/build/export_generators/hardcoded-cmake/common_cmake_lists.jinja
new file mode 100644
index 0000000000..0799708dbd
--- /dev/null
+++ b/build/export_generators/hardcoded-cmake/common_cmake_lists.jinja
@@ -0,0 +1,9 @@
+
+{% 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 5c9e735ec3..64d5b2cc26 100644
--- a/build/export_generators/hardcoded-cmake/root_cmake_lists.jinja
+++ b/build/export_generators/hardcoded-cmake/root_cmake_lists.jinja
@@ -39,7 +39,10 @@ else()
       CONF "tools.cmake.cmaketoolchain:generator=${CMAKE_GENERATOR}"
   )
 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 %}
+{% 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 -%}