From 66ddebeea213686193b13591d07fc512adee740c Mon Sep 17 00:00:00 2001
From: Rod Widdowson <rdw@steadingsoftware.com>
Date: Fri, 12 Oct 2012 13:26:22 +0000
Subject: [PATCH] Separate Versions and Includes properties sheets for building

---
 cpp-xmltooling.sln     |  2 +-
 msbuild/Includes.props | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++
 msbuild/Versions.props | 17 ++++++++++++++++
 3 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 msbuild/Includes.props
 create mode 100644 msbuild/Versions.props

diff --git a/cpp-xmltooling.sln b/cpp-xmltooling.sln
index 7b85cf3..6124a93 100644
--- a/cpp-xmltooling.sln
+++ b/cpp-xmltooling.sln
@@ -1,6 +1,6 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio 2010
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{61BF324D-2532-49C9-93CE-DF0E89529D4F}"
 	ProjectSection(SolutionItems) = preProject
 		m4\acinclude.m4 = m4\acinclude.m4
diff --git a/msbuild/Includes.props b/msbuild/Includes.props
new file mode 100644
index 0000000..a6bbd30
--- /dev/null
+++ b/msbuild/Includes.props
@@ -0,0 +1,53 @@
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Wibble">
+    <ExecutablePath>$(ExecutablePath)</ExecutablePath>
+    <IncludePath Condition="'$(Platform)'=='Win32'">$(BuildRoot)\$(openssl)\inc32;$(BuildRoot)\$(curl)\include;$(BuildRoot)\$(log4shib)\include;$(BuildRoot)\$(xerces)\include;$(BuildRoot)\$(xmlsec);$(BuildRoot)\nsapi\include;$(BuildRoot)\$(fcgi)\include;$(BuildRoot)\cxxtest;$(BuildRoot)\$(zlib);$(BuildRoot)\$(boost);$(IncludePath)</IncludePath>
+    <IncludePath Condition="'$(Platform)'=='x64'">$(BuildRoot)\$(openssl)\inc64;$(BuildRoot)\$(curl)\include;$(BuildRoot)\$(log4shib)\include;$(BuildRoot)\$(xerces)\include;$(BuildRoot)\$(xmlsec);$(BuildRoot)\nsapi\include;$(BuildRoot)\$(fcgi)\include;$(BuildRoot)\cxxtest;$(BuildRoot)\$(zlib);$(BuildRoot)\$(boost);$(IncludePath)</IncludePath>
+    <ReferencePath>$(ReferencePath)</ReferencePath>
+    <LibraryPath Condition="'$(Platform)'=='Win32'">$(BuildRoot)\$(openssl)\out32dll;$(BuildRoot)\$(openssl)\out32dll.dbg;$(BuildRoot)\$(curl)\lib\debug-dll-ssl-dll-zlib-dll;$(BuildRoot)\$(curl)\lib\release-dll-ssl-dll-zlib-dll;$(BuildRoot)\$(log4shib)\msvc10\Debug;$(BuildRoot)\$(log4shib)\msvc10\Release;$(BuildRoot)\$(xerces)\lib;$(BuildRoot)\$(xmlsec)\Build\Win32\VC10\Debug No Xalan;$(BuildRoot)\$(xmlsec)\Build\Win32\VC10\Release No Xalan;$(BuildRoot)\nsapi\lib;$(BuildRoot)\$(fcgi)\Win32\Debug;$(BuildRoot)\$(fcgi)\Win32\Release;$(BuildRoot)\$(zlib)\Debug;$(BuildRoot)\$(zlib)\Release;$(LibraryPath)</LibraryPath>
+    <LibraryPath Condition="'$(Platform)'=='x64'">$(BuildRoot)\$(openssl)\out64dll;$(BuildRoot)\$(openssl)\out64dll.dbg;$(BuildRoot)\$(curl)\lib\debug-dll-ssl-dll-zlib-dll.x64;$(BuildRoot)\$(curl)\lib\release-dll-ssl-dll-zlib-dll.x64;$(BuildRoot)\$(log4shib)\msvc10\x64\Debug;$(BuildRoot)\$(log4shib)\msvc10\x64\Release;$(BuildRoot)\$(xerces)\lib;$(BuildRoot)\$(xmlsec)\Build\x64\VC10\Debug No Xalan;$(BuildRoot)\$(xmlsec)\Build\x64\VC10\Release No Xalan;$(BuildRoot)\$(fcgi)\Win32\x64\Debug;$(BuildRoot)\$(fcgi)\Win32\x64\Release;$(BuildRoot)\$(zlib)\x64\Debug;$(BuildRoot)\$(zlib)\x64\Release;$(LibraryPath)</LibraryPath>
+    <SourcePath>$(SourcePath)</SourcePath>
+    <ExcludePath>$(ExcludePath)</ExcludePath>
+  </PropertyGroup>
+  <ItemGroup>
+    <BuildMacro Include="BuildRoot">
+      <Value>$(BuildRoot)</Value>
+    </BuildMacro>
+    <BuildMacro Include="CxxTestRoot">
+      <Value>$(CxxTestRoot)</Value>
+    </BuildMacro>
+    <BuildMacro Include="ApacheRoot">
+      <Value>$(ApacheRoot)</Value>
+    </BuildMacro>
+    <BuildMacro Include="openssl">
+      <Value>$(openssl)</Value>
+    </BuildMacro>
+    <BuildMacro Include="curl">
+      <Value>$(curl)</Value>
+    </BuildMacro>
+    <BuildMacro Include="xerces">
+      <Value>$(xerces)</Value>
+    </BuildMacro>
+    <BuildMacro Include="xmlsec">
+      <Value>$(xmlsec)</Value>
+    </BuildMacro>
+    <BuildMacro Include="boost">
+      <Value>$(boost)</Value>
+    </BuildMacro>
+    <BuildMacro Include="log4shib">
+      <Value>$(log4shib)</Value>
+    </BuildMacro>
+    <BuildMacro Include="zlib">
+      <Value>$(zlib)</Value>
+    </BuildMacro>
+    <BuildMacro Include="fcgi">
+      <Value>$(fcgi)</Value>
+    </BuildMacro>
+  </ItemGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+  </ItemDefinitionGroup>
+</Project>
diff --git a/msbuild/Versions.props b/msbuild/Versions.props
new file mode 100644
index 0000000..0422357
--- /dev/null
+++ b/msbuild/Versions.props
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="VersionMacros">
+    <CxxTestRoot>$(BuildRoot)\cxxtest</CxxTestRoot>
+    <ApacheRoot>C:\</ApacheRoot>
+    <openssl>openssl-1.0.1c</openssl>
+    <curl>curl-7.26.0</curl>
+    <xerces Condition="'$(Platform)'=='x64'">xerces-c-3.1.1-x86_64-windows-vc-10.0</xerces>
+    <xerces Condition="'$(Platform)'=='win32'">xerces-c-3.1.1-x86-windows-vc-10.0</xerces>
+    <xmlsec>xml-security-c-1.7.0</xmlsec>
+    <boost>boost_1_49_0</boost>
+    <log4shib>log4shib-1.0.5</log4shib>
+    <zlib>zlib-1.2.7</zlib>
+    <fcgi>fcgi-2.4.0-VC10</fcgi>
+
+  </PropertyGroup>
+</Project>
-- 
2.1.4