Browse Source

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
fix_tk_recipe_env_info
j.spijker@ultimaker.com 4 years ago committed by Jelle Spijker
parent
commit
0088f7f5d8
  1. 15
      profiles/cura.jinja
  2. 15
      profiles/cura_build.jinja
  3. 4
      profiles/cura_debug.jinja
  4. 4
      profiles/cura_release.jinja

15
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 %}

15
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 %}

4
profiles/cura_debug.jinja

@ -2,6 +2,4 @@ include(cura.jinja)
[settings]
build_type=Debug
{% if compiler == "Visual Studio" %}
compiler.runtime=MDd
{% endif %}
{% if compiler == 'Visual Studio' %}compiler.runtime=MDd{% endif %}

4
profiles/cura_release.jinja

@ -2,6 +2,4 @@ include(cura.jinja)
[settings]
build_type=Release
{% if compiler == "Visual Studio" %}
compiler.runtime=MD
{% endif %}
{% if compiler == 'Visual Studio' %}compiler.runtime=MD{% endif %}

Loading…
Cancel
Save