From d0bfe170bfe64ea05bbd2dba01477b076a2a23ed Mon Sep 17 00:00:00 2001 From: moko256 Date: Fri, 27 Aug 2021 09:11:05 +0900 Subject: [PATCH] Use `{{projectName}}` as BINARY_NAME and CMake project name in UWP template (#87859) --- AUTHORS | 1 + .../winuwp.tmpl/{CMakeLists.txt => CMakeLists.txt.tmpl} | 4 ++-- packages/flutter_tools/templates/template_manifest.json | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) rename packages/flutter_tools/templates/app_shared/winuwp.tmpl/{CMakeLists.txt => CMakeLists.txt.tmpl} (96%) diff --git a/AUTHORS b/AUTHORS index 591e37043db..71d7f107b1b 100644 --- a/AUTHORS +++ b/AUTHORS @@ -82,3 +82,4 @@ Alexis Rouillard Mirko Mucaria Karol Czeryna Callum Moffat +Koutaro Mori diff --git a/packages/flutter_tools/templates/app_shared/winuwp.tmpl/CMakeLists.txt b/packages/flutter_tools/templates/app_shared/winuwp.tmpl/CMakeLists.txt.tmpl similarity index 96% rename from packages/flutter_tools/templates/app_shared/winuwp.tmpl/CMakeLists.txt rename to packages/flutter_tools/templates/app_shared/winuwp.tmpl/CMakeLists.txt.tmpl index 13282d1099a..fe718ef46be 100644 --- a/packages/flutter_tools/templates/app_shared/winuwp.tmpl/CMakeLists.txt +++ b/packages/flutter_tools/templates/app_shared/winuwp.tmpl/CMakeLists.txt.tmpl @@ -4,11 +4,11 @@ set(CMAKE_SYSTEM_VERSION 10.0) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED YES) -project(runner LANGUAGES CXX) +project({{projectName}} LANGUAGES CXX) cmake_policy(SET CMP0079 NEW) -set(BINARY_NAME "app") +set(BINARY_NAME "{{projectName}}") # Configure build options. get_property(IS_MULTICONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) diff --git a/packages/flutter_tools/templates/template_manifest.json b/packages/flutter_tools/templates/template_manifest.json index d929f22096b..92ef080c2db 100644 --- a/packages/flutter_tools/templates/template_manifest.json +++ b/packages/flutter_tools/templates/template_manifest.json @@ -142,7 +142,7 @@ "templates/app_shared/windows.tmpl/runner/utils.h", "templates/app_shared/windows.tmpl/runner/win32_window.cpp", "templates/app_shared/windows.tmpl/runner/win32_window.h", - "templates/app_shared/winuwp.tmpl/CMakeLists.txt", + "templates/app_shared/winuwp.tmpl/CMakeLists.txt.tmpl", "templates/app_shared/winuwp.tmpl/flutter/CMakeLists.txt", "templates/app_shared/winuwp.tmpl/project_version", "templates/app_shared/winuwp.tmpl/runner_uwp/appxmanifest.in",