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

diff --git a/w32/basedir.props b/w32/basedir.props
index c35275b02bb3b3b11e5d031dea90e820b10908b8..d546c842ae2962ef417918181331ae014556403c 100644 (file)
--- 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 58480c8763520ebc2dfaa7456fc1bcba89ecddd0..b54f65d0f735350138ac876bc3c21020bfeb6455 100644 (file)
--- 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>