kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1409 in FS/freeswitch from ~ANDYWOLK/freeswitch:feature/FS-10690-integrate-robust-and-convenient to master 

Merging requested changes related to basedir for Windows VS projects

* commit '9f12a57c1de067b93c902a95159efd2e9d098ed9':
  FS-10690: [libblade, Build-System] Do not import BaseDir props if already imported.
This commit is contained in:
Shane Bryldt 2017-10-07 13:50:42 +00:00
parent 1991ce4817 9f12a57c1d
commit 0ea88f57af
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
w32/basedir.props
View File

@ -3,4 +3,7 @@
<PropertyGroup Label="UserMacros" Condition=" '$(BaseDir)' == ''">
<BaseDir>$(MSBuildThisFileDirectory)..\</BaseDir>
</PropertyGroup>
<PropertyGroup>
<BaseDirImported>true</BaseDirImported>
</PropertyGroup>
</Project>

2
w32/pcre-version.props
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="basedir.props"/>
<Import Project="basedir.props" Condition=" '$(BaseDirImported)' == ''"/>
</ImportGroup>
<PropertyGroup Label="UserMacros">
<PCREVersion>8.34</PCREVersion>