RGBCube/nu_scripts
1
Fork 0
mirror of https://github.com/RGBCube/nu_scripts synced 2025-07-30 13:47:46 +00:00
Code Issues Activity

Prepend INCLUDE env, instead of override (#1127)

Browse source 
This small fix prepends the `INCLUDE` environment variable instead of
overriding it.

This is important if one has already added paths to this environment,
for example, in cases where one needs a common set of codebase that gets
included in all C/C++ projects (such as utility functions and such).
This commit is contained in:
S. Abid Hashimi 2025-06-03 02:10:20 +02:00 • committed by GitHub
parent 765555bedd
commit 3c32fbfade
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
modules/virtual_environments/nu_msvs/nu_msvs.nu
View file

@ -1,6 +1,7 @@
def --env find_msvs [] {
export-env {
$env.MSVS_BASE_PATH = $env.Path
$env.INCLUDE_BEFORE = if "INCLUDE" in $env { ($env.INCLUDE | split row (char esep)) } else { null }
$env.PATH_VAR = (if "Path" in $env { "Path" } else { "PATH" })
# According to https://github.com/microsoft/vswhere/wiki/Installing, vswhere should always be in this location.
@ -161,8 +162,8 @@ export def --env activate [
}
load-env {
$env.PATH_VAR: $env_path,
INCLUDE: $env.MSVS_INCLUDE_PATH,
LIB: $lib_path
INCLUDE: ($env.MSVS_INCLUDE_PATH | append $env.INCLUDE_BEFORE),
LIB: $lib_path,
}
# Debug Information
@ -181,7 +182,6 @@ export def --env deactivate [] {
$env.PATH_VAR: $env.MSVS_BASE_PATH,
}
hide-env INCLUDE
hide-env LIB
hide-env MSVS_BASE_PATH
hide-env MSVS_ROOT
@ -189,4 +189,13 @@ export def --env deactivate [] {
hide-env MSVS_MSDK_ROOT
hide-env MSVS_MSDK_VER
hide-env MSVS_INCLUDE_PATH
}
if $env.INCLUDE_BEFORE == null {
hide-env INCLUDE
} else {
load-env {
INCLUDE: ($env.INCLUDE_BEFORE | path expand | str join (char esep))
}
hide-env INCLUDE_BEFORE
}
}