projects
/
shibboleth
/
cpp-xmltooling.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
59831dc
)
Parameterize msbuild path
author
Scott Cantor
<cantor.2@osu.edu>
Tue, 21 May 2013 17:37:18 +0000
(17:37 +0000)
committer
Scott Cantor
<cantor.2@osu.edu>
Tue, 21 May 2013 17:37:18 +0000
(17:37 +0000)
cpp-xmltooling.sln
patch
|
blob
|
history
xmltooling/xmltooling-lite.vcxproj
patch
|
blob
|
history
xmltooling/xmltooling.vcxproj
patch
|
blob
|
history
xmltoolingtest/xmltoolingtest.vcxproj
patch
|
blob
|
history
diff --git
a/cpp-xmltooling.sln
b/cpp-xmltooling.sln
index
6547480
..
7b85cf3
100644
(file)
--- 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
\r
doxygen.cfg = doxygen.cfg
\r
m4\doxygen.m4 = m4\doxygen.m4
\r
doxygen.am = doxygen.am
\r
doxygen.cfg = doxygen.cfg
\r
m4\doxygen.m4 = m4\doxygen.m4
\r
- msbuild\Includes.props = msbuild\Includes.props
\r
Makefile.am = Makefile.am
\r
Makefile.am = Makefile.am
\r
- msbuild\Versions.props = msbuild\Versions.props
\r
xmltooling.spec.in = xmltooling.spec.in
\r
EndProjectSection
\r
EndProject
\r
xmltooling.spec.in = xmltooling.spec.in
\r
EndProjectSection
\r
EndProject
\r
diff --git
a/xmltooling/xmltooling-lite.vcxproj
b/xmltooling/xmltooling-lite.vcxproj
index
085736c
..
cdcead2
100644
(file)
--- a/
xmltooling/xmltooling-lite.vcxproj
+++ b/
xmltooling/xmltooling-lite.vcxproj
@@
-59,8
+59,8
@@
</ImportGroup>
\r
<PropertyGroup Label="UserMacros" />
\r
<Import Project="..\..\BuildPath.props" />
\r
</ImportGroup>
\r
<PropertyGroup Label="UserMacros" />
\r
<Import Project="..\..\BuildPath.props" />
\r
- <Import Project="
..\MsBuild
\Versions.props" />
\r
- <Import Project="
..\MsBuild
\Includes.props" />
\r
+ <Import Project="
$(ParentRoot)
\Versions.props" />
\r
+ <Import Project="
$(ParentRoot)
\Includes.props" />
\r
<PropertyGroup>
\r
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
\r
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)-$(Configuration)\</IntDir>
\r
<PropertyGroup>
\r
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
\r
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)-$(Configuration)\</IntDir>
\r
diff --git
a/xmltooling/xmltooling.vcxproj
b/xmltooling/xmltooling.vcxproj
index
5514e32
..
59faf8b
100644
(file)
--- a/
xmltooling/xmltooling.vcxproj
+++ b/
xmltooling/xmltooling.vcxproj
@@
-59,8
+59,8
@@
</ImportGroup>
\r
<PropertyGroup Label="UserMacros" />
\r
<Import Project="..\..\BuildPath.props" />
\r
</ImportGroup>
\r
<PropertyGroup Label="UserMacros" />
\r
<Import Project="..\..\BuildPath.props" />
\r
- <Import Project="
..\MsBuild
\Versions.props" />
\r
- <Import Project="
..\MsBuild
\Includes.props" />
\r
+ <Import Project="
$(ParentRoot)
\Versions.props" />
\r
+ <Import Project="
$(ParentRoot)
\Includes.props" />
\r
<PropertyGroup>
\r
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
\r
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
\r
<PropertyGroup>
\r
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
\r
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
\r
diff --git
a/xmltoolingtest/xmltoolingtest.vcxproj
b/xmltoolingtest/xmltoolingtest.vcxproj
index
70897cd
..
cbe4f74
100644
(file)
--- a/
xmltoolingtest/xmltoolingtest.vcxproj
+++ b/
xmltoolingtest/xmltoolingtest.vcxproj
@@
-21,7
+21,7
@@
<PropertyGroup Label="Globals">
\r
<ProjectGuid>{3E34CDCC-FCBA-490D-A165-1CB6F4559799}</ProjectGuid>
\r
<RootNamespace>xmltoolingtest</RootNamespace>
\r
<PropertyGroup Label="Globals">
\r
<ProjectGuid>{3E34CDCC-FCBA-490D-A165-1CB6F4559799}</ProjectGuid>
\r
<RootNamespace>xmltoolingtest</RootNamespace>
\r
- <CxxTestRoot>
..\..\..
\cxxtest\</CxxTestRoot>
\r
+ <CxxTestRoot>
$(BuildRoot)
\cxxtest\</CxxTestRoot>
\r
<Keyword>Win32Proj</Keyword>
\r
</PropertyGroup>
\r
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
\r
<Keyword>Win32Proj</Keyword>
\r
</PropertyGroup>
\r
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
\r
@@
-60,8
+60,8
@@
</ImportGroup>
\r
<PropertyGroup Label="UserMacros" />
\r
<Import Project="..\..\BuildPath.props" />
\r
</ImportGroup>
\r
<PropertyGroup Label="UserMacros" />
\r
<Import Project="..\..\BuildPath.props" />
\r
- <Import Project="
..\MsBuild
\Versions.props" />
\r
- <Import Project="
..\MsBuild
\Includes.props" />
\r
+ <Import Project="
$(ParentRoot)
\Versions.props" />
\r
+ <Import Project="
$(ParentRoot)
\Includes.props" />
\r
<PropertyGroup>
\r
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
\r
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
\r
<PropertyGroup>
\r
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
\r
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
\r