From f58702a1865aca9ff47d424aae5299e4fedfab5f Mon Sep 17 00:00:00 2001
From: Scott Cantor <cantor.2@osu.edu>
Date: Tue, 21 May 2013 17:37:18 +0000
Subject: [PATCH] Parameterize msbuild path

---
 cpp-xmltooling.sln                    | 2 --
 xmltooling/xmltooling-lite.vcxproj    | 4 ++--
 xmltooling/xmltooling.vcxproj         | 4 ++--
 xmltoolingtest/xmltoolingtest.vcxproj | 6 +++---
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/cpp-xmltooling.sln b/cpp-xmltooling.sln
index 6547480..7b85cf3 100644
--- a/cpp-xmltooling.sln
+++ b/cpp-xmltooling.sln
@@ -12,9 +12,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{61BF324D-2
 		doxygen.am = doxygen.am
 		doxygen.cfg = doxygen.cfg
 		m4\doxygen.m4 = m4\doxygen.m4
-		msbuild\Includes.props = msbuild\Includes.props
 		Makefile.am = Makefile.am
-		msbuild\Versions.props = msbuild\Versions.props
 		xmltooling.spec.in = xmltooling.spec.in
 	EndProjectSection
 EndProject
diff --git a/xmltooling/xmltooling-lite.vcxproj b/xmltooling/xmltooling-lite.vcxproj
index 085736c..cdcead2 100644
--- a/xmltooling/xmltooling-lite.vcxproj
+++ b/xmltooling/xmltooling-lite.vcxproj
@@ -59,8 +59,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <Import Project="..\..\BuildPath.props" />
-  <Import Project="..\MsBuild\Versions.props" />
-  <Import Project="..\MsBuild\Includes.props" />
+  <Import Project="$(ParentRoot)\Versions.props" />
+  <Import Project="$(ParentRoot)\Includes.props" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)-$(Configuration)\</IntDir>
diff --git a/xmltooling/xmltooling.vcxproj b/xmltooling/xmltooling.vcxproj
index 5514e32..59faf8b 100644
--- a/xmltooling/xmltooling.vcxproj
+++ b/xmltooling/xmltooling.vcxproj
@@ -59,8 +59,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <Import Project="..\..\BuildPath.props" />
-  <Import Project="..\MsBuild\Versions.props" />
-  <Import Project="..\MsBuild\Includes.props" />
+  <Import Project="$(ParentRoot)\Versions.props" />
+  <Import Project="$(ParentRoot)\Includes.props" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
diff --git a/xmltoolingtest/xmltoolingtest.vcxproj b/xmltoolingtest/xmltoolingtest.vcxproj
index 70897cd..cbe4f74 100644
--- a/xmltoolingtest/xmltoolingtest.vcxproj
+++ b/xmltoolingtest/xmltoolingtest.vcxproj
@@ -21,7 +21,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{3E34CDCC-FCBA-490D-A165-1CB6F4559799}</ProjectGuid>
     <RootNamespace>xmltoolingtest</RootNamespace>
-    <CxxTestRoot>..\..\..\cxxtest\</CxxTestRoot>
+    <CxxTestRoot>$(BuildRoot)\cxxtest\</CxxTestRoot>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -60,8 +60,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <Import Project="..\..\BuildPath.props" />
-  <Import Project="..\MsBuild\Versions.props" />
-  <Import Project="..\MsBuild\Includes.props" />
+  <Import Project="$(ParentRoot)\Versions.props" />
+  <Import Project="$(ParentRoot)\Includes.props" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-- 
2.1.4