FS-10690: [libblade] Added basedir.props from existing pending PR from Andrey Volk to support PCRE build requirements for blade on windows, currently only used by newly added PCRE props which are not yet used by FS projects

2017-10-02 13:09:51 -06:00 · 2017-10-02 13:09:51 -06:00 · 099580022d
parent 560fd03842
commit 099580022d
9 changed files with 67 additions and 0 deletions
--- a/libs/libblade/libblade.vcxproj
+++ b/libs/libblade/libblade.vcxproj
@ -60,6 +60,7 @@
    <Import Project="..\..\w32\sodium.props" />
    <Import Project="..\..\w32\config.props" />
    <Import Project="..\..\w32\civetweb.props" />
+    <Import Project="..\..\w32\pcre.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@ -68,6 +69,7 @@
    <Import Project="..\..\w32\sodium.props" />
    <Import Project="..\..\w32\config.props" />
    <Import Project="..\..\w32\civetweb.props" />
+    <Import Project="..\..\w32\pcre.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@ -76,6 +78,7 @@
    <Import Project="..\..\w32\sodium.props" />
    <Import Project="..\..\w32\config.props" />
    <Import Project="..\..\w32\civetweb.props" />
+    <Import Project="..\..\w32\pcre.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@ -84,6 +87,7 @@
    <Import Project="..\..\w32\sodium.props" />
    <Import Project="..\..\w32\config.props" />
    <Import Project="..\..\w32\civetweb.props" />
+    <Import Project="..\..\w32\pcre.props" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
--- a/libs/libblade/switchblade/switchblade.vcxproj
+++ b/libs/libblade/switchblade/switchblade.vcxproj
@ -62,6 +62,7 @@
    <Import Project="..\..\..\w32\sodium.props" />
    <Import Project="..\..\..\w32\config.props" />
    <Import Project="..\..\..\w32\civetweb.props" />
+    <Import Project="..\..\..\w32\pcre.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@ -69,6 +70,7 @@
    <Import Project="..\..\..\w32\sodium.props" />
    <Import Project="..\..\..\w32\config.props" />
    <Import Project="..\..\..\w32\civetweb.props" />
+    <Import Project="..\..\..\w32\pcre.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@ -76,6 +78,7 @@
    <Import Project="..\..\..\w32\sodium.props" />
    <Import Project="..\..\..\w32\config.props" />
    <Import Project="..\..\..\w32\civetweb.props" />
+    <Import Project="..\..\..\w32\pcre.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@ -83,6 +86,7 @@
    <Import Project="..\..\..\w32\sodium.props" />
    <Import Project="..\..\..\w32\config.props" />
    <Import Project="..\..\..\w32\civetweb.props" />
+    <Import Project="..\..\..\w32\pcre.props" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
--- a/libs/libblade/test/bladec.vcxproj
+++ b/libs/libblade/test/bladec.vcxproj
@ -62,6 +62,7 @@
    <Import Project="..\..\..\w32\sodium.props" />
    <Import Project="..\..\..\w32\config.props" />
    <Import Project="..\..\..\w32\civetweb.props" />
+    <Import Project="..\..\..\w32\pcre.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@ -69,6 +70,7 @@
    <Import Project="..\..\..\w32\sodium.props" />
    <Import Project="..\..\..\w32\config.props" />
    <Import Project="..\..\..\w32\civetweb.props" />
+    <Import Project="..\..\..\w32\pcre.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@ -76,6 +78,7 @@
    <Import Project="..\..\..\w32\sodium.props" />
    <Import Project="..\..\..\w32\config.props" />
    <Import Project="..\..\..\w32\civetweb.props" />
+    <Import Project="..\..\..\w32\pcre.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@ -83,6 +86,7 @@
    <Import Project="..\..\..\w32\sodium.props" />
    <Import Project="..\..\..\w32\config.props" />
    <Import Project="..\..\..\w32\civetweb.props" />
+    <Import Project="..\..\..\w32\pcre.props" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
--- a/libs/libblade/test/blades.vcxproj
+++ b/libs/libblade/test/blades.vcxproj
@ -62,6 +62,7 @@
    <Import Project="..\..\..\w32\sodium.props" />
    <Import Project="..\..\..\w32\config.props" />
    <Import Project="..\..\..\w32\civetweb.props" />
+    <Import Project="..\..\..\w32\pcre.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@ -69,6 +70,7 @@
    <Import Project="..\..\..\w32\sodium.props" />
    <Import Project="..\..\..\w32\config.props" />
    <Import Project="..\..\..\w32\civetweb.props" />
+    <Import Project="..\..\..\w32\pcre.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@ -76,6 +78,7 @@
    <Import Project="..\..\..\w32\sodium.props" />
    <Import Project="..\..\..\w32\config.props" />
    <Import Project="..\..\..\w32\civetweb.props" />
+    <Import Project="..\..\..\w32\pcre.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@ -83,6 +86,7 @@
    <Import Project="..\..\..\w32\sodium.props" />
    <Import Project="..\..\..\w32\config.props" />
    <Import Project="..\..\..\w32\civetweb.props" />
+    <Import Project="..\..\..\w32\pcre.props" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
--- a/libs/libblade/test/testcli.vcxproj
+++ b/libs/libblade/test/testcli.vcxproj
@ -62,6 +62,7 @@
    <Import Project="..\..\..\w32\sodium.props" />
    <Import Project="..\..\..\w32\config.props" />
    <Import Project="..\..\..\w32\civetweb.props" />
+    <Import Project="..\..\..\w32\pcre.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@ -69,6 +70,7 @@
    <Import Project="..\..\..\w32\sodium.props" />
    <Import Project="..\..\..\w32\config.props" />
    <Import Project="..\..\..\w32\civetweb.props" />
+    <Import Project="..\..\..\w32\pcre.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@ -76,6 +78,7 @@
    <Import Project="..\..\..\w32\sodium.props" />
    <Import Project="..\..\..\w32\config.props" />
    <Import Project="..\..\..\w32\civetweb.props" />
+    <Import Project="..\..\..\w32\pcre.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@ -83,6 +86,7 @@
    <Import Project="..\..\..\w32\sodium.props" />
    <Import Project="..\..\..\w32\config.props" />
    <Import Project="..\..\..\w32\civetweb.props" />
+    <Import Project="..\..\..\w32\pcre.props" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
--- a/libs/libblade/test/testcon.vcxproj
+++ b/libs/libblade/test/testcon.vcxproj
@ -62,6 +62,7 @@
    <Import Project="..\..\..\w32\sodium.props" />
    <Import Project="..\..\..\w32\config.props" />
    <Import Project="..\..\..\w32\civetweb.props" />
+    <Import Project="..\..\..\w32\pcre.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@ -69,6 +70,7 @@
    <Import Project="..\..\..\w32\sodium.props" />
    <Import Project="..\..\..\w32\config.props" />
    <Import Project="..\..\..\w32\civetweb.props" />
+    <Import Project="..\..\..\w32\pcre.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@ -76,6 +78,7 @@
    <Import Project="..\..\..\w32\sodium.props" />
    <Import Project="..\..\..\w32\config.props" />
    <Import Project="..\..\..\w32\civetweb.props" />
+    <Import Project="..\..\..\w32\pcre.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@ -83,6 +86,7 @@
    <Import Project="..\..\..\w32\sodium.props" />
    <Import Project="..\..\..\w32\config.props" />
    <Import Project="..\..\..\w32\civetweb.props" />
+    <Import Project="..\..\..\w32\pcre.props" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
--- a/w32/basedir.props
+++ b/w32/basedir.props
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="UserMacros" Condition=" '$(BaseDir)' == ''">
+      <BaseDir>$(MSBuildThisFileDirectory)..\</BaseDir>
+  </PropertyGroup>
+</Project>
--- a/w32/pcre-version.props
+++ b/w32/pcre-version.props
@ -0,0 +1,19 @@
+<?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"/>
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros">
+    <PCREVersion>8.34</PCREVersion>
+  </PropertyGroup>
+  <PropertyGroup>
+    <PCREVersionImported>true</PCREVersionImported>
+  </PropertyGroup>
+  <PropertyGroup />
+  <ItemDefinitionGroup />
+  <ItemGroup>
+    <BuildMacro Include="PCREVersion">
+      <Value>$(PCREVersion)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>
--- a/w32/pcre.props
+++ b/w32/pcre.props
@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+    <Import Project="pcre-version.props" Condition=" '$(PCREVersionImported)' == ''"/>
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <PCREPropsImported>true</PCREPropsImported>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(BaseDir)libs\pcre-$(PCREVersion);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <PreprocessorDefinitions>PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup />
+</Project>