From: Andrey Volk <andywolk@gmail.com>
Date: Sat, 7 Oct 2017 13:46:42 +0000 (+0300)
Subject: FS-10690: [libblade, Build-System] Do not import BaseDir props if already imported.
X-Git-Tag: v1.8.0~237^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9f12a57c1de067b93c902a95159efd2e9d098ed9;p=thirdparty%2Ffreeswitch.git

FS-10690: [libblade, Build-System] Do not import BaseDir props if already imported.
---

diff --git a/w32/basedir.props b/w32/basedir.props
index c35275b02b..d546c842ae 100644
--- a/w32/basedir.props
+++ b/w32/basedir.props
@@ -3,4 +3,7 @@
   <PropertyGroup Label="UserMacros" Condition=" '$(BaseDir)' == ''">
       <BaseDir>$(MSBuildThisFileDirectory)..\</BaseDir>
   </PropertyGroup>
+  <PropertyGroup>
+    <BaseDirImported>true</BaseDirImported>
+  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/w32/pcre-version.props b/w32/pcre-version.props
index 58480c8763..b54f65d0f7 100644
--- a/w32/pcre-version.props
+++ b/w32/pcre-version.props
@@ -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>