diff options
| author | Steve Dower <steve.dower@python.org> | 2023-02-03 18:54:48 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-03 18:54:48 (GMT) |
| commit | 3139ea33ed84190e079d6ff4859baccdad778dae (patch) | |
| tree | a9f479d21d88e8349cd3e6abd570c7b077a02ff2 /PCbuild/python.props | |
| parent | 42b14044aabee01491acee3a524827358f560ca9 (diff) | |
| download | cpython-3139ea33ed84190e079d6ff4859baccdad778dae.zip cpython-3139ea33ed84190e079d6ff4859baccdad778dae.tar.gz cpython-3139ea33ed84190e079d6ff4859baccdad778dae.tar.bz2 | |
gh-101522: Allow overriding Windows dependencies versions and paths using MSBuild properties (GH-101523)
Diffstat (limited to 'PCbuild/python.props')
| -rw-r--r-- | PCbuild/python.props | 39 |
1 files changed, 24 insertions, 15 deletions
diff --git a/PCbuild/python.props b/PCbuild/python.props index f9dd872..1f9b0e7 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -52,23 +52,32 @@ <BuildPath Condition="'$(BuildPath)' == ''">$(PySourcePath)PCbuild\$(ArchName)\</BuildPath> <BuildPath Condition="!HasTrailingSlash($(BuildPath))">$(BuildPath)\</BuildPath> <BuildPath Condition="$(Configuration) == 'PGInstrument'">$(BuildPath)instrumented\</BuildPath> - - <!-- Directories of external projects. tcltk is handled in tcltk.props --> - <ExternalsDir>$(EXTERNALS_DIR)</ExternalsDir> + </PropertyGroup> + + <!-- Directories of external projects. tcltk is handled in tcltk.props --> + <PropertyGroup> + <ExternalsDir Condition="$(ExternalsDir) == ''">$(EXTERNALS_DIR)</ExternalsDir> <ExternalsDir Condition="$(ExternalsDir) == ''">$([System.IO.Path]::GetFullPath(`$(PySourcePath)externals`))</ExternalsDir> <ExternalsDir Condition="!HasTrailingSlash($(ExternalsDir))">$(ExternalsDir)\</ExternalsDir> - <sqlite3Dir>$(ExternalsDir)sqlite-3.39.4.0\</sqlite3Dir> - <bz2Dir>$(ExternalsDir)bzip2-1.0.8\</bz2Dir> - <lzmaDir>$(ExternalsDir)xz-5.2.5\</lzmaDir> - <libffiDir>$(ExternalsDir)libffi-3.3.0\</libffiDir> - <libffiOutDir>$(ExternalsDir)libffi-3.3.0\$(ArchName)\</libffiOutDir> - <libffiIncludeDir>$(libffiOutDir)include</libffiIncludeDir> - <opensslDir>$(ExternalsDir)openssl-1.1.1s\</opensslDir> - <opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1s\$(ArchName)\</opensslOutDir> - <opensslIncludeDir>$(opensslOutDir)include</opensslIncludeDir> - <nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir> - <zlibDir>$(ExternalsDir)\zlib-1.2.13\</zlibDir> - + </PropertyGroup> + + <Import Project="$(ExternalProps)" Condition="$(ExternalProps) != '' and Exists('$(ExternalProps)')" /> + + <PropertyGroup> + <sqlite3Dir Condition="$(sqlite3Dir) == ''">$(ExternalsDir)sqlite-3.39.4.0\</sqlite3Dir> + <bz2Dir Condition="$(bz2Dir) == ''">$(ExternalsDir)bzip2-1.0.8\</bz2Dir> + <lzmaDir Condition="$(lzmaDir) == ''">$(ExternalsDir)xz-5.2.5\</lzmaDir> + <libffiDir Condition="$(libffiDir) == ''">$(ExternalsDir)libffi-3.3.0\</libffiDir> + <libffiOutDir Condition="$(libffiOutDir) == ''">$(libffiDir)$(ArchName)\</libffiOutDir> + <libffiIncludeDir Condition="$(libffiIncludeDir) == ''">$(libffiOutDir)include</libffiIncludeDir> + <opensslDir Condition="$(opensslDir) == ''">$(ExternalsDir)openssl-1.1.1s\</opensslDir> + <opensslOutDir Condition="$(opensslOutDir) == ''">$(ExternalsDir)openssl-bin-1.1.1s\$(ArchName)\</opensslOutDir> + <opensslIncludeDir Condition="$(opensslIncludeDir) == ''">$(opensslOutDir)include</opensslIncludeDir> + <nasmDir Condition="$(nasmDir) == ''">$(ExternalsDir)\nasm-2.11.06\</nasmDir> + <zlibDir Condition="$(zlibDir) == ''">$(ExternalsDir)\zlib-1.2.13\</zlibDir> + </PropertyGroup> + + <PropertyGroup> <!-- Suffix for all binaries when building for debug --> <PyDebugExt Condition="'$(PyDebugExt)' == '' and $(Configuration) == 'Debug'">_d</PyDebugExt> |