Skip to content

Commit 9367ee5

Browse files
committed
New CMake generator style fixes
Export style fixes 92d1ac710c97841b0e2a51ae1404b343ce3895a4
1 parent 8943520 commit 9367ee5

File tree

8 files changed

+17
-17
lines changed

8 files changed

+17
-17
lines changed

build/export_generators/cmake/dir_cmake_lists.jinja

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
{%- include '[generator]/disclaimer.jinja' %}
2-
{% include 'prologue.cmake' ignore missing -%}
1+
{%- include '[generator]/disclaimer.jinja' -%}
2+
{%- include 'prologue.cmake' ignore missing -%}
33

44
{%- include "[generator]/dir_packages.jinja" -%}
55
{%- include "[generator]/dir_tools.jinja" -%}
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
{%- if dir_includes is defined %}
2-
{% for dir_include in dir_includes -%}
1+
{%- if dir_includes|length -%}
2+
{%- for dir_include in dir_includes %}
33
include({{ dir_include }})
4-
{% endfor -%}
5-
{%- endif -%}
4+
{% endfor %}
5+
{% endif -%}
66

7-
{%- if subdirs|length %}
8-
{% for subdir in subdirs -%}
7+
{%- if subdirs|length -%}
8+
{%- for subdir in subdirs %}
99
add_subdirectory({{ subdir }})
10-
{% endfor -%}
11-
{%- endif -%}
10+
{%- endfor %}
11+
{% endif -%}

build/export_generators/cmake/dir_macroses.jinja

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{%- if dir_macroses is defined -%}
1+
{%- if dir_macroses|length -%}
22
{%- for dir_macros in dir_macroses -%}
33
{%- if dir_macros.macro == "set_vars" -%}
44
{%- for set_var in dir_macros.args %}

build/export_generators/cmake/dir_packages.jinja

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
{%- endif -%}
1616
{%- endif -%}
1717
{%- if packages|length -%}
18-
{%- for package in packages -%}
18+
{%- for package in packages %}
1919
find_package({{ package.name }} REQUIRED
2020
{%- if package.components|length %} COMPONENTS
2121
{%- for component in package.components %}
@@ -30,7 +30,7 @@ find_package({{ package.name }} REQUIRED
3030
{%- if target is defined -%}
3131
{{ RenderPackages(target) }}
3232
{%- endif -%}
33-
{%- if extra_targets is defined -%}
33+
{%- if extra_targets|length -%}
3434
{%- for extra_target in extra_targets -%}
3535
{{ RenderPackages(extra_target) }}
3636
{%- endfor -%}

build/export_generators/cmake/dir_targets.jinja

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
{%- set current_target = target -%}
7373
{%- include '[generator]/target_cmake_lists.jinja' -%}
7474
{%- endif -%}
75-
{%- if extra_targets is defined -%}
75+
{%- if extra_targets|length -%}
7676
{%- for current_target in extra_targets -%}
7777
{%- include '[generator]/target_cmake_lists.jinja' -%}
7878
{%- endfor -%}

build/export_generators/cmake/dir_tools.jinja

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{%- if tools is defined -%}
1+
{%- if tools|length -%}
22
{%- for tool in tools -%}
33
{%- set path_and_name = rsplit(tool, "/", 2) -%}
44
{%- set toolPath = path_and_name[0] -%}

build/export_generators/cmake/disclaimer.jinja

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated by the YaTool build system (https://github.com/yandex/yatool),
1+
# This file was generated by the YaTool build system (https://github.com/yandex/yatool),
22
# from a source YaTool build configuration provided in ya.make files.
33
#
44
# If the repository supports both CMake and ya build configurations, please modify both of them.

build/export_generators/cmake/root_cmake_lists.jinja

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% include '[generator]/disclaimer.jinja' %}
1+
{%- include '[generator]/disclaimer.jinja' -%}
22

33
cmake_minimum_required(VERSION 3.15)
44
if (POLICY CMP0132)

0 commit comments

Comments
 (0)