From 0088f7f5d85f7008ff009796e9d964eb29356a25 Mon Sep 17 00:00:00 2001
From: "j.spijker@ultimaker.com" <jelle spijker>
Date: Sat, 11 Jun 2022 13:21:05 +0200
Subject: [PATCH] Use platform.system to determine if powershell runs

Apparently it was a problem referring to `os` and `os_build`
in the jinja template later on, since those values were determined
on the fly as well

Contributes to CURA-9365
---
 profiles/cura.jinja         | 15 ++++++++-------
 profiles/cura_build.jinja   | 15 ++++++++-------
 profiles/cura_debug.jinja   |  4 +---
 profiles/cura_release.jinja |  4 +---
 4 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/profiles/cura.jinja b/profiles/cura.jinja
index 9df08cb..0a1d9b5 100644
--- a/profiles/cura.jinja
+++ b/profiles/cura.jinja
@@ -3,17 +3,18 @@ include(default)
 [build_requires]
 
 [settings]
-os={{ {"Darwin": "Macos"}.get(platform.system(), platform.system()) }}
-os_build={{ {"Darwin": "Macos"}.get(platform.system(), platform.system()) }}
+os='{{ {'Darwin': 'Macos'}.get(platform.system(), platform.system()) }}'
+os_build='{{ {'Darwin': 'Macos'}.get(platform.system(), platform.system()) }}'
 compiler.cppstd=17
-{% if compiler == "gcc" %}compiler.libcxx=libstdc++11
-{% elif compiler == "apple-clang" %}compiler.libcxx=libc++
-{% elif compiler == "Visual Studio" %}compiler.toolset=v142{% endif %}
+{% if compiler == 'gcc' %}compiler.libcxx=libstdc++11
+{% elif compiler == 'apple-clang' %}compiler.libcxx=libc++
+{% elif compiler == 'Visual Studio' %}compiler.toolset=v142
+{% endif %}
 [options]
 
 [env]
 
 [conf]
 tools.cmake.cmaketoolchain:find_package_prefer_config=True
-{% if os_build != "Windows" %}{% else %}tools.env.virtualenv:powershell=True{% endif %}
-{% if compiler == "Visual Studio" %}tools.microsoft.msbuild:vs_version=compiler.version{% endif %}
+{% if platform.system() == 'Windows' %}tools.env.virtualenv:powershell=True{% endif %}
+{% if compiler == 'Visual Studio' %}tools.microsoft.msbuild:vs_version=compiler.version{% endif %}
diff --git a/profiles/cura_build.jinja b/profiles/cura_build.jinja
index 174a54a..0a1d9b5 100644
--- a/profiles/cura_build.jinja
+++ b/profiles/cura_build.jinja
@@ -3,17 +3,18 @@ include(default)
 [build_requires]
 
 [settings]
-os={{ {"Darwin": "Macos"}.get(platform.system(), platform.system()) }}
-os_build={{ {"Darwin": "Macos"}.get(platform.system(), platform.system()) }}
+os='{{ {'Darwin': 'Macos'}.get(platform.system(), platform.system()) }}'
+os_build='{{ {'Darwin': 'Macos'}.get(platform.system(), platform.system()) }}'
 compiler.cppstd=17
-{% if compiler == "gcc" %}compiler.libcxx=libstdc++11
-{% elif compiler == "apple-clang" %}compiler.libcxx=libc++
-{% elif compiler == "Visual Studio" %}compiler.toolset=v142{% endif %}
+{% if compiler == 'gcc' %}compiler.libcxx=libstdc++11
+{% elif compiler == 'apple-clang' %}compiler.libcxx=libc++
+{% elif compiler == 'Visual Studio' %}compiler.toolset=v142
+{% endif %}
 [options]
 
 [env]
 
 [conf]
 tools.cmake.cmaketoolchain:find_package_prefer_config=True
-{% if os_build == "Windows" %}tools.env.virtualenv:powershell=True{% endif %}
-{% if compiler == "Visual Studio" %}tools.microsoft.msbuild:vs_version=compiler.version{% endif %}
+{% if platform.system() == 'Windows' %}tools.env.virtualenv:powershell=True{% endif %}
+{% if compiler == 'Visual Studio' %}tools.microsoft.msbuild:vs_version=compiler.version{% endif %}
diff --git a/profiles/cura_debug.jinja b/profiles/cura_debug.jinja
index 8248d9f..e9d1562 100644
--- a/profiles/cura_debug.jinja
+++ b/profiles/cura_debug.jinja
@@ -2,6 +2,4 @@ include(cura.jinja)
 
 [settings]
 build_type=Debug
-{% if compiler == "Visual Studio" %}
-    compiler.runtime=MDd
-{% endif %}
\ No newline at end of file
+{% if compiler == 'Visual Studio' %}compiler.runtime=MDd{% endif %}
diff --git a/profiles/cura_release.jinja b/profiles/cura_release.jinja
index 9fa38ab..7a354f2 100644
--- a/profiles/cura_release.jinja
+++ b/profiles/cura_release.jinja
@@ -2,6 +2,4 @@ include(cura.jinja)
 
 [settings]
 build_type=Release
-{% if compiler == "Visual Studio" %}
-    compiler.runtime=MD
-{% endif %}
\ No newline at end of file
+{% if compiler == 'Visual Studio' %}compiler.runtime=MD{% endif %}