Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/vcpkg/base/system.process.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -315,13 +315,18 @@ namespace vcpkg
L"CUDA_PATH_V11_1",
L"CUDA_PATH_V11_2",
L"CUDA_TOOLKIT_ROOT_DIR",
// Environmental variable generated automatically by CUDA after installation
// Environment variable generated automatically by CUDA after installation
L"NVCUDASAMPLES_ROOT",
L"NVTOOLSEXT_PATH",
// Enables find_package(Vulkan) in CMake. Environmental variable generated by Vulkan SDK installer
// Enables find_package(Vulkan) in CMake. Environment variable generated by Vulkan SDK installer
L"VULKAN_SDK",
// Enable targeted Android NDK
L"ANDROID_NDK_HOME",
// Environment variables generated automatically by Intel oneAPI after installation
L"ONEAPI_ROOT",
L"IFORT_COMPILER19",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
L"IFORT_COMPILER19",
L"IFORT_COMPILER19",
L"IFORT_COMPILER20",
L"IFORT_COMPILER21",

maybe move all those variables into the triplet via VCPKG_ENV_PASSTHROUGH_UNTRACKED ?
And I don't mean only the ones I added I mean all of them.

L"IFORT_COMPILER20",
L"IFORT_COMPILER21",
};

const Optional<std::string> keep_vars = get_environment_variable("VCPKG_KEEP_ENV_VARS");
Expand Down