Closes #23154: Fix unnecessary recompilation of OpenSSL on Windows

diff --git a/PCbuild/libeay.vcxproj b/PCbuild/libeay.vcxproj
index 4adec9082db21c23e733aa64b6c06c22cd4d0a26..8348bc0bc4546f0d195c51301c9c5a440e4965ab 100644 (file)
--- 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
index b64c3e1ebdebdfa34556cf93205bf399053cabc3..356159eca15eb8ba5505c2ac5e8227197c7bff86 100644 (file)
--- 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
index bd7dd40a2a2d13e2db9850fa1ac29b9f00f73582..f00c606a3854f940a936be68b27c7a00603bc7e5 100644 (file)
--- 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" />