[cpp-xmltooling COMMIT] in /branches/REL_1: cpp-xmltooling.sln xmltooling/xmltooling-lite.vcxproj xmltooling/xmltooli...

[noreply at shibboleth.net]

Author: scantor
Date: Tue May 21 13:37:18 2013
New Revision: 1028

URL: http://svn.shibboleth.net/view/cpp-xmltooling?rev=1028&view=rev
Log:
Parameterize msbuild path

Modified:
    branches/REL_1/cpp-xmltooling.sln
    branches/REL_1/xmltooling/xmltooling-lite.vcxproj
    branches/REL_1/xmltooling/xmltooling.vcxproj
    branches/REL_1/xmltoolingtest/xmltoolingtest.vcxproj

Modified: branches/REL_1/cpp-xmltooling.sln
URL: http://svn.shibboleth.net/view/cpp-xmltooling/branches/REL_1/cpp-xmltooling.sln?rev=1028&r1=1027&r2=1028&view=diff
==============================================================================
--- branches/REL_1/cpp-xmltooling.sln (original)
+++ branches/REL_1/cpp-xmltooling.sln Tue May 21 13:37:18 2013
@@ -12,9 +12,7 @@
 		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

Modified: branches/REL_1/xmltooling/xmltooling-lite.vcxproj
URL: http://svn.shibboleth.net/view/cpp-xmltooling/branches/REL_1/xmltooling/xmltooling-lite.vcxproj?rev=1028&r1=1027&r2=1028&view=diff
==============================================================================
--- branches/REL_1/xmltooling/xmltooling-lite.vcxproj (original)
+++ branches/REL_1/xmltooling/xmltooling-lite.vcxproj Tue May 21 13:37:18 2013
@@ -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>

Modified: branches/REL_1/xmltooling/xmltooling.vcxproj
URL: http://svn.shibboleth.net/view/cpp-xmltooling/branches/REL_1/xmltooling/xmltooling.vcxproj?rev=1028&r1=1027&r2=1028&view=diff
==============================================================================
--- branches/REL_1/xmltooling/xmltooling.vcxproj (original)
+++ branches/REL_1/xmltooling/xmltooling.vcxproj Tue May 21 13:37:18 2013
@@ -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>

Modified: branches/REL_1/xmltoolingtest/xmltoolingtest.vcxproj
URL: http://svn.shibboleth.net/view/cpp-xmltooling/branches/REL_1/xmltoolingtest/xmltoolingtest.vcxproj?rev=1028&r1=1027&r2=1028&view=diff
==============================================================================
--- branches/REL_1/xmltoolingtest/xmltoolingtest.vcxproj (original)
+++ branches/REL_1/xmltoolingtest/xmltoolingtest.vcxproj Tue May 21 13:37:18 2013
@@ -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>