[Python-checkins] cpython: Closes #23154: Fix unnecessary recompilation of OpenSSL on Windows

Sun Jan 4 05:33:26 CET 2015

https://hg.python.org/cpython/rev/d53506fe31e1
changeset: 94013:d53506fe31e1
user: Zachary Ware <zachary.ware at gmail.com>
date: Sat Jan 03 22:33:10 2015 -0600
summary:
 Closes #23154: Fix unnecessary recompilation of OpenSSL on Windows
files:
 PCbuild/libeay.vcxproj | 6 ------
 PCbuild/openssl.props | 6 ++++++
 PCbuild/ssleay.vcxproj | 6 ------
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/PCbuild/libeay.vcxproj b/PCbuild/libeay.vcxproj
--- a/PCbuild/libeay.vcxproj
+++ b/PCbuild/libeay.vcxproj
@@ -42,12 +42,6 @@
 <Import Project="python.props" />
 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
 <Import Project="openssl.props" />
-
- <PropertyGroup Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <IntDir Condition="'$(Platform)' != 'x64'">$(opensslDir)tmp32\libeay\</IntDir>
- <IntDir Condition="'$(Platform)' == 'x64'">$(opensslDir)tmp64\libeay\</IntDir>
- </PropertyGroup>
 
 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 
diff --git a/PCbuild/openssl.props b/PCbuild/openssl.props
--- a/PCbuild/openssl.props
+++ b/PCbuild/openssl.props
@@ -2,6 +2,12 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 <Import Project="pyproject.props" />
 
+ <PropertyGroup Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <IntDir>$(opensslDir)tmp\$(ArchName)_$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="$(Configuration) == 'PGInstrument' or $(Configuration) == 'PGUpdate'">$(opensslDir)tmp\$(ArchName)\$(ProjectName)\</IntDir>
+ </PropertyGroup>
+
 <ItemGroup>
 <PreprocessorDefinitions Include="DSO_WIN32" />
 <PreprocessorDefinitions Include="WIN32_LEAN_AND_MEAN" />
diff --git a/PCbuild/ssleay.vcxproj b/PCbuild/ssleay.vcxproj
--- a/PCbuild/ssleay.vcxproj
+++ b/PCbuild/ssleay.vcxproj
@@ -42,12 +42,6 @@
 <Import Project="python.props" />
 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
 <Import Project="openssl.props" />
-
- <PropertyGroup Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <IntDir Condition="'$(Platform)' != 'x64'">$(opensslDir)tmp32\ssleay\</IntDir>
- <IntDir Condition="'$(Platform)' == 'x64'">$(opensslDir)tmp64\ssleay\</IntDir>
- </PropertyGroup>
 
 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 
-- 
Repository URL: https://hg.python.org/cpython
