msvc: Allow overriding of build options with custom file

- by default look for a user.props in the msvc directory, which is more convenient
  than the built-in way of looking for such file in the user's home directory
- make git ignore the file
This commit is contained in:
stijn 2015-04-30 10:14:59 +02:00
parent 6f218d7472
commit a62c106974
2 changed files with 7 additions and 2 deletions

4
.gitignore vendored
View File

@ -33,5 +33,7 @@ tests/*.out
###################### ######################
__pycache__/ __pycache__/
# Customized Makefile overrides # Customized Makefile/project overrides
######################
GNUmakefile GNUmakefile
user.props

View File

@ -72,7 +72,9 @@
<Import Project="msvc/common.props" /> <Import Project="msvc/common.props" />
<Import Project="msvc/release.props" /> <Import Project="msvc/release.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros">
<CustomPropsFile Condition="'$(CustomPropsFile)'==''">msvc/user.props</CustomPropsFile>
</PropertyGroup>
<PropertyGroup /> <PropertyGroup />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile /> <ClCompile />
@ -94,6 +96,7 @@
</ItemGroup> </ItemGroup>
<Import Project="msvc/sources.props" /> <Import Project="msvc/sources.props" />
<Import Project="msvc/genhdr.targets" /> <Import Project="msvc/genhdr.targets" />
<Import Project="$(CustomPropsFile)" Condition="exists('$(CustomPropsFile)')" />
<Target Name="GenHeaders" BeforeTargets="BuildGenerateSources" DependsOnTargets="GenerateHeaders"> <Target Name="GenHeaders" BeforeTargets="BuildGenerateSources" DependsOnTargets="GenerateHeaders">
</Target> </Target>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />