Skip to content
Merged
Show file tree
Hide file tree
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
23 changes: 15 additions & 8 deletions tools/ci_build/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -620,32 +620,29 @@ def generate_build_tree(
)
generate_vcpkg_triplets_for_emscripten(
build_dir,
configs,
emscripten_root_path,
not args.disable_rtti,
not args.disable_wasm_exception_catching,
args.minimal_build is not None,
args.enable_address_sanitizer,
)
elif args.android:
generate_android_triplets(build_dir, args.android_cpp_shared, args.android_api)
generate_android_triplets(build_dir, configs, args.android_cpp_shared, args.android_api)
elif is_windows():
generate_windows_triplets(build_dir, args.msvc_toolset)
generate_windows_triplets(build_dir, configs, args.msvc_toolset)
elif is_macOS():
osx_target = args.apple_deploy_target
if args.apple_deploy_target is None:
osx_target = os.environ.get("MACOSX_DEPLOYMENT_TARGET")
if osx_target is not None:
log.info(f"Setting VCPKG_OSX_DEPLOYMENT_TARGET to {osx_target}")
generate_macos_triplets(build_dir, osx_target)
generate_macos_triplets(build_dir, configs, osx_target)
else:
# Linux, *BSD, AIX or other platforms
generate_linux_triplets(build_dir)
generate_linux_triplets(build_dir, configs)
add_default_definition(cmake_extra_defines, "CMAKE_TOOLCHAIN_FILE", str(vcpkg_toolchain_path))

vcpkg_install_options = generate_vcpkg_install_options(build_dir, args)
# VCPKG_INSTALL_OPTIONS is a CMake list. It must be joined by semicolons
# Therefore, if any of the option string contains a semicolon, it must be escaped
add_default_definition(cmake_extra_defines, "VCPKG_INSTALL_OPTIONS", ";".join(vcpkg_install_options))
# Choose the cmake triplet
triplet = None
if args.build_wasm:
Expand Down Expand Up @@ -1251,6 +1248,16 @@ def generate_build_tree(
]
env = {}
if args.use_vcpkg:
# append VCPKG_INSTALL_OPTIONS
#
# VCPKG_INSTALL_OPTIONS is a CMake list. It must be joined by semicolons
# Therefore, if any of the option string contains a semicolon, it must be escaped
temp_cmake_args += [
"-DVCPKG_INSTALL_OPTIONS={}".format(
";".join(generate_vcpkg_install_options(Path(build_dir) / config, args))
)
]

vcpkg_keep_env_vars = ["TRT_UPLOAD_AUTH_TOKEN"]

if args.build_wasm:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,12 @@ jobs:
clean: true
submodules: none

- task: UsePythonVersion@0
inputs:
versionSpec: '3.12'
addToPath: true
architecture: 'x64'

- template: templates/get-docker-image-steps.yml
parameters:
Dockerfile: tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cuda
Expand Down
Loading
Loading