diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2017-08-03 04:34:56 -0400 |
|---|---|---|
| committer | Jeffrey Walton <noloader@gmail.com> | 2017-08-03 04:34:56 -0400 |
| commit | 1702c93b308e4f9d009980ccedcf4c3d493daff8 (patch) | |
| tree | 9e30a3baeb849e84523e4c63a54a847ab2bc1e70 /TestScripts | |
| parent | 08b68c2718464c3add60fdcb764c6a558cbfa320 (diff) | |
| download | cryptopp-git-1702c93b308e4f9d009980ccedcf4c3d493daff8.tar.gz | |
Reinstate commit ac513c06f8c80
Even though it breaks AppVeyor worse, its needed that way. Also see https://stackoverflow.com/a/45458443/608639.
Diffstat (limited to 'TestScripts')
| -rw-r--r-- | TestScripts/cryptest.vcxproj | 15 | ||||
| -rw-r--r-- | TestScripts/cryptlib.vcxproj | 15 |
2 files changed, 18 insertions, 12 deletions
diff --git a/TestScripts/cryptest.vcxproj b/TestScripts/cryptest.vcxproj index a961cfeb..51623c7d 100644 --- a/TestScripts/cryptest.vcxproj +++ b/TestScripts/cryptest.vcxproj @@ -34,12 +34,7 @@ <Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{09cdac08-e6ae-48a9-8de7-0fbc779eebde}</ProjectGuid>
- <RootNamespace>cryptest</RootNamespace>
- <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
- <ConfigurationType>Application</ConfigurationType>
- </PropertyGroup>
+ <!-- Relocated by JW in AUG 2017 -->
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -49,6 +44,14 @@ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
+ <!-- Global property group must follow imports due to PlatformToolset -->
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{09cdac08-e6ae-48a9-8de7-0fbc779eebde}</ProjectGuid>
+ <RootNamespace>cryptest</RootNamespace>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+ <ConfigurationType>Application</ConfigurationType>
+ </PropertyGroup>
+ <PropertyGroup Label="UserMacros" />
<!-- End of Visual Studio boilerplate -->
<!-- All Configurations -->
<PropertyGroup Label="All Configurations">
diff --git a/TestScripts/cryptlib.vcxproj b/TestScripts/cryptlib.vcxproj index b9bdc749..dcc772d7 100644 --- a/TestScripts/cryptlib.vcxproj +++ b/TestScripts/cryptlib.vcxproj @@ -34,12 +34,7 @@ <Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{c39f4b46-6e89-4074-902e-ca57073044d2}</ProjectGuid>
- <RootNamespace>cryptlib</RootNamespace>
- <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
- <ConfigurationType>StaticLibrary</ConfigurationType>
- </PropertyGroup>
+ <!-- Relocated by JW in AUG 2017 -->
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -49,6 +44,14 @@ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
+ <!-- Global property group must follow imports due to PlatformToolset -->
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{c39f4b46-6e89-4074-902e-ca57073044d2}</ProjectGuid>
+ <RootNamespace>cryptlib</RootNamespace>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ </PropertyGroup>
+ <PropertyGroup Label="UserMacros" />
<!-- End of Visual Studio boilerplate -->
<!-- All Configurations -->
<PropertyGroup Label="All Configurations">
|