[Mobies-commit] [commit] r4114 - in UDM/trunk: . Projects/Win32/VC10/src Projects/Win32/VC10/src/UdmBase Projects/Win32/VC10/src/UdmDll Projects/Win32/VC10/src/UdmDom Projects/Win32/VC10/src/UdmGme Projects/Win32/VC10/src/UdmOcl Projects/Win32/VC10/src/UdmOclPat/GOCL/src Projects/Win32/VC10/src/UdmPOI Projects/Win32/VC10/src/UdmUtil Projects/Win32/VC10/src/UdmXmi Projects/Win32/VC10/src/Uml
ksmyth at redhat1.isis.vanderbilt.edu
ksmyth at redhat1.isis.vanderbilt.edu
Wed Oct 3 09:39:49 CDT 2012
Author: ksmyth
Date: Wed Oct 3 09:39:49 2012
New Revision: 4114
Log:
VS2012 support
Added:
UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDllv110.vcxproj (contents, props changed)
- copied, changed from r4113, UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDll.vcxproj
UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDllv110.vcxproj.filters
UDM/trunk/Projects/Win32/VC10/src/Udmv110.sln
UDM/trunk/Udm.props
Modified:
UDM/trunk/Projects/Win32/VC10/src/UdmBase/UdmBase.vcxproj
UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDll.vcxproj
UDM/trunk/Projects/Win32/VC10/src/UdmDom/UdmDom.vcxproj
UDM/trunk/Projects/Win32/VC10/src/UdmGme/UdmGme.vcxproj
UDM/trunk/Projects/Win32/VC10/src/UdmOcl/UdmOcl.vcxproj
UDM/trunk/Projects/Win32/VC10/src/UdmOclPat/GOCL/src/GOCL.vcxproj
UDM/trunk/Projects/Win32/VC10/src/UdmPOI/UdmPOI.vcxproj
UDM/trunk/Projects/Win32/VC10/src/UdmUtil/UdmUtil.vcxproj
UDM/trunk/Projects/Win32/VC10/src/UdmXmi/UdmXmi.vcxproj
UDM/trunk/Projects/Win32/VC10/src/Uml/Uml.vcxproj
UDM/trunk/make.msbuild
Modified: UDM/trunk/Projects/Win32/VC10/src/UdmBase/UdmBase.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/UdmBase/UdmBase.vcxproj Wed Oct 3 09:39:16 2012 (r4113)
+++ UDM/trunk/Projects/Win32/VC10/src/UdmBase/UdmBase.vcxproj Wed Oct 3 09:39:49 2012 (r4114)
@@ -79,30 +79,35 @@
<Import Project="..\zlib.props" />
<Import Project="..\Xerces-c.props" />
<Import Project="..\boost.props" />
+ <Import Project="..\..\..\..\..\Udm.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='BootUdmCompile Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
<Import Project="..\zlib.props" />
<Import Project="..\Xerces-c.props" />
<Import Project="..\boost.props" />
+ <Import Project="..\..\..\..\..\Udm.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='BootUdmCompile Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
<Import Project="..\zlib.props" />
<Import Project="..\Xerces-c.props" />
<Import Project="..\boost.props" />
+ <Import Project="..\..\..\..\..\Udm.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='BootUdmCompile Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
<Import Project="..\zlib.props" />
<Import Project="..\Xerces-c.props" />
<Import Project="..\boost.props" />
+ <Import Project="..\..\..\..\..\Udm.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
<Import Project="..\zlib.props" />
<Import Project="..\Xerces-c.props" />
<Import Project="..\boost.props" />
+ <Import Project="..\..\..\..\..\Udm.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
@@ -110,12 +115,14 @@
<Import Project="..\Xerces-c.props" />
<Import Project="..\boost.props" />
<Import Project="..\..\..\..\..\Udm_x64.props" />
+ <Import Project="..\..\..\..\..\Udm.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
<Import Project="..\zlib.props" />
<Import Project="..\Xerces-c.props" />
<Import Project="..\boost.props" />
+ <Import Project="..\..\..\..\..\Udm.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
@@ -123,25 +130,16 @@
<Import Project="..\Xerces-c.props" />
<Import Project="..\boost.props" />
<Import Project="..\..\..\..\..\Udm_x64.props" />
+ <Import Project="..\..\..\..\..\Udm.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\..\Build\Win32\VC10\Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)obj\src\$(ProjectName)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\..\Build\Win32\VC10\Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)obj\src\$(ProjectName)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='BootUdmCompile Debug|Win32'">..\..\..\..\..\Build\Win32\VC10\BootUdmCompileDebug\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='BootUdmCompile Debug|x64'">..\..\..\..\..\Build\Win32\VC10\BootUdmCompileDebug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='BootUdmCompile Debug|Win32'">$(OutDir)obj\src\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='BootUdmCompile Debug|x64'">$(OutDir)obj\src\$(ProjectName)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='BootUdmCompile Release|Win32'">..\..\..\..\..\Build\Win32\VC10\BootUdmCompileRelease\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='BootUdmCompile Release|x64'">..\..\..\..\..\Build\Win32\VC10\BootUdmCompileRelease\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='BootUdmCompile Release|Win32'">$(OutDir)obj\src\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='BootUdmCompile Release|x64'">$(OutDir)obj\src\$(ProjectName)\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)D</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)D</TargetName>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
Modified: UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDll.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDll.vcxproj Wed Oct 3 09:39:16 2012 (r4113)
+++ UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDll.vcxproj Wed Oct 3 09:39:49 2012 (r4114)
@@ -51,6 +51,7 @@
<Import Project="..\Xerces-c.props" />
<Import Project="..\Xalan-c.props" />
<Import Project="..\zlib.props" />
+ <Import Project="..\..\..\..\..\Udm.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
@@ -58,12 +59,14 @@
<Import Project="..\Xalan-c.props" />
<Import Project="..\zlib.props" />
<Import Project="..\..\..\..\..\Udm_x64.props" />
+ <Import Project="..\..\..\..\..\Udm.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
<Import Project="..\Xerces-c.props" />
<Import Project="..\Xalan-c.props" />
<Import Project="..\zlib.props" />
+ <Import Project="..\..\..\..\..\Udm.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
@@ -71,16 +74,13 @@
<Import Project="..\Xalan-c.props" />
<Import Project="..\zlib.props" />
<Import Project="..\..\..\..\..\Udm_x64.props" />
+ <Import Project="..\..\..\..\..\Udm.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\..\Build\Win32\VC10\Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)obj\src\$(ProjectName)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\..\Build\Win32\VC10\Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)obj\src\$(ProjectName)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">UdmDll_3_2_VS10D</TargetName>
@@ -88,6 +88,8 @@
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">UdmDll_3_2_VS10</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">UdmDll_3_2_$(PlatformToolset)_$(Platform)</TargetName>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Midl>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Copied and modified: UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDllv110.vcxproj (from r4113, UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDll.vcxproj)
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDll.vcxproj Wed Oct 3 09:39:16 2012 (r4113, copy source)
+++ UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDllv110.vcxproj Wed Oct 3 09:39:49 2012 (r4114)
@@ -19,29 +19,34 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
- <ProjectGuid>{3CAE3DEE-065E-426C-9C3C-F1F59217C00B}</ProjectGuid>
+ <ProjectGuid>{2C29618E-960B-41CE-82AD-983A49FFA29E}</ProjectGuid>
<RootNamespace>UdmDll</RootNamespace>
+ <ProjectName>UdmDllv110</ProjectName>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -51,6 +56,7 @@
<Import Project="..\Xerces-c.props" />
<Import Project="..\Xalan-c.props" />
<Import Project="..\zlib.props" />
+ <Import Project="..\..\..\..\..\Udm.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
@@ -58,12 +64,14 @@
<Import Project="..\Xalan-c.props" />
<Import Project="..\zlib.props" />
<Import Project="..\..\..\..\..\Udm_x64.props" />
+ <Import Project="..\..\..\..\..\Udm.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
<Import Project="..\Xerces-c.props" />
<Import Project="..\Xalan-c.props" />
<Import Project="..\zlib.props" />
+ <Import Project="..\..\..\..\..\Udm.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
@@ -71,16 +79,13 @@
<Import Project="..\Xalan-c.props" />
<Import Project="..\zlib.props" />
<Import Project="..\..\..\..\..\Udm_x64.props" />
+ <Import Project="..\..\..\..\..\Udm.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\..\Build\Win32\VC10\Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)obj\src\$(ProjectName)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\..\Build\Win32\VC10\Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)obj\src\$(ProjectName)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">UdmDll_3_2_VS10D</TargetName>
@@ -88,6 +93,8 @@
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">UdmDll_3_2_VS10</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">UdmDll_3_2_$(PlatformToolset)_$(Platform)</TargetName>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Midl>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -133,14 +140,13 @@
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
- <ImportLibrary>$(OutDir)UdmDll_VS10.lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
+ <ImportLibrary>$(OutDir)UdmDll_$(PlatformToolset)_$(Platform).lib</ImportLibrary>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<PostBuildEvent />
<CustomBuildStep>
<Command>xcopy /Y/D/F "$(TargetPath)" "$(UDM_PATH)"\bin && ^
-xcopy /Y/D/F "$(OutDir)"\UdmDll_VS10.lib "$(UDM_PATH)"\lib
+xcopy /Y/D/F "$(OutDir)"\UdmDll_$(PlatformToolset)_$(Platform).lib "$(UDM_PATH)"\lib
</Command>
<Message>Copy $(TargetName) to bin</Message>
<Outputs>$(UDM_PATH)\bin\$(TargetName)</Outputs>
@@ -199,7 +205,7 @@
<PostBuildEvent />
<CustomBuildStep>
<Command>xcopy /Y/D/F "$(TargetPath)" "$(UDM_PATH)"\bin && ^
-xcopy /Y/D/F "$(OutDir)"\UdmDll_v100_x64.lib "$(UDM_PATH)"\lib
+xcopy /Y/D/F "$(OutDir)"\UdmDll_$(PlatformToolset)_$(Platform).lib "$(UDM_PATH)"\lib
</Command>
<Message>Copy $(TargetName) to bin</Message>
<Outputs>$(UDM_PATH)\bin\$(TargetName)</Outputs>
@@ -249,14 +255,13 @@
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
- <ImportLibrary>$(OutDir)UdmDll_VS10D.lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
+ <ImportLibrary>$(OutDir)UdmDll_$(PlatformToolset)_$(Platform)D.lib</ImportLibrary>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<PostBuildEvent />
<CustomBuildStep>
<Command>xcopy /Y/D/F "$(TargetPath)" "$(UDM_PATH)"\bin && ^
-xcopy /Y/D/F "$(OutDir)"\UdmDll_VS10D.lib "$(UDM_PATH)"\lib
+xcopy /Y/D/F "$(OutDir)"\UdmDll_$(PlatformToolset)_$(Platform)D.lib "$(UDM_PATH)"\lib
</Command>
<Message>Copy $(TargetName) to bin</Message>
<Outputs>$(UDM_PATH)\bin\$(TargetName)</Outputs>
@@ -312,7 +317,7 @@
<PostBuildEvent />
<CustomBuildStep>
<Command>xcopy /Y/D/F "$(TargetPath)" "$(UDM_PATH)"\bin && ^
-xcopy /Y/D/F "$(OutDir)"\UdmDll_v100_x64D.lib "$(UDM_PATH)"\lib
+xcopy /Y/D/F "$(OutDir)"\UdmDll_$(PlatformToolset)_$(Platform)D.lib "$(UDM_PATH)"\lib
</Command>
<Message>Copy $(TargetName) to bin</Message>
<Outputs>$(UDM_PATH)\bin\$(TargetName)</Outputs>
@@ -373,11 +378,6 @@
</ProjectReference>
<ProjectReference Include="..\UdmXmi\UdmXmi.vcxproj">
<Project>{ca16ed97-f738-4faf-985c-fae05aed8d07}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- <Private>false</Private>
- <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
- <LinkLibraryDependencies>false</LinkLibraryDependencies>
- <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
</ProjectReference>
<ProjectReference Include="..\Uml\Uml.vcxproj">
<Project>{6a53e343-14c2-4463-a9c8-332dae560eaf}</Project>
Added: UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDllv110.vcxproj.filters
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDllv110.vcxproj.filters Wed Oct 3 09:39:49 2012 (r4114)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{01ca2d30-ec9a-4bd1-b7c5-0263bcb19ffc}</UniqueIdentifier>
+ <Extensions>h;hpp;hxx;hm;inl</Extensions>
+ </Filter>
+ <Filter Include="Resource Files">
+ <UniqueIdentifier>{aa2dc834-94cf-4a69-aa14-7b2c534fba29}</UniqueIdentifier>
+ <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
+ </Filter>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{04e723c5-64c1-4db1-8f39-287096ef5483}</UniqueIdentifier>
+ <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\..\..\..\src\UdmDll\UdmDll.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="UdmDll.rc">
+ <Filter>Source Files</Filter>
+ </ResourceCompile>
+ </ItemGroup>
+</Project>
\ No newline at end of file
Modified: UDM/trunk/Projects/Win32/VC10/src/UdmDom/UdmDom.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/UdmDom/UdmDom.vcxproj Wed Oct 3 09:39:16 2012 (r4113)
+++ UDM/trunk/Projects/Win32/VC10/src/UdmDom/UdmDom.vcxproj Wed Oct 3 09:39:49 2012 (r4114)
@@ -49,31 +49,33 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
<Import Project="..\Xerces-c.props" />
+ <Import Project="..\..\..\..\..\Udm.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
<Import Project="..\Xerces-c.props" />
<Import Project="..\..\..\..\..\Udm_x64.props" />
+ <Import Project="..\..\..\..\..\Udm.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
<Import Project="..\Xerces-c.props" />
+ <Import Project="..\..\..\..\..\Udm.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
<Import Project="..\Xerces-c.props" />
<Import Project="..\..\..\..\..\Udm_x64.props" />
+ <Import Project="..\..\..\..\..\Udm.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\..\Build\Win32\VC10\Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)obj\src\$(ProjectName)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\..\Build\Win32\VC10\Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)obj\src\$(ProjectName)\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)D</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)D</TargetName>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
Modified: UDM/trunk/Projects/Win32/VC10/src/UdmGme/UdmGme.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/UdmGme/UdmGme.vcxproj Wed Oct 3 09:39:16 2012 (r4113)
+++ UDM/trunk/Projects/Win32/VC10/src/UdmGme/UdmGme.vcxproj Wed Oct 3 09:39:49 2012 (r4114)
@@ -48,28 +48,30 @@
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+ <Import Project="..\..\..\..\..\Udm.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
<Import Project="..\..\..\..\..\Udm_x64.props" />
+ <Import Project="..\..\..\..\..\Udm.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+ <Import Project="..\..\..\..\..\Udm.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
<Import Project="..\..\..\..\..\Udm_x64.props" />
+ <Import Project="..\..\..\..\..\Udm.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\..\Build\Win32\VC10\Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)obj\src\$(ProjectName)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\..\Build\Win32\VC10\Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)obj\src\$(ProjectName)\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)D</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)D</TargetName>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalOptions>/I /gme/interfaces" " %(AdditionalOptions)</AdditionalOptions>
Modified: UDM/trunk/Projects/Win32/VC10/src/UdmOcl/UdmOcl.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/UdmOcl/UdmOcl.vcxproj Wed Oct 3 09:39:16 2012 (r4113)
+++ UDM/trunk/Projects/Win32/VC10/src/UdmOcl/UdmOcl.vcxproj Wed Oct 3 09:39:49 2012 (r4114)
@@ -48,27 +48,23 @@
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+ <Import Project="..\..\..\..\..\Udm.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+ <Import Project="..\..\..\..\..\Udm.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+ <Import Project="..\..\..\..\..\Udm.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+ <Import Project="..\..\..\..\..\Udm.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\..\Build\Win32\VC10\Debug\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\..\..\Build\Win32\VC10\Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)obj\src\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)obj\src\$(ProjectName)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\..\Build\Win32\VC10\Release\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\..\..\Build\Win32\VC10\Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)obj\src\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)obj\src\$(ProjectName)\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)D</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)D</TargetName>
</PropertyGroup>
Modified: UDM/trunk/Projects/Win32/VC10/src/UdmOclPat/GOCL/src/GOCL.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/UdmOclPat/GOCL/src/GOCL.vcxproj Wed Oct 3 09:39:16 2012 (r4113)
+++ UDM/trunk/Projects/Win32/VC10/src/UdmOclPat/GOCL/src/GOCL.vcxproj Wed Oct 3 09:39:49 2012 (r4114)
@@ -48,28 +48,30 @@
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+ <Import Project="..\..\..\..\..\..\..\Udm.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
<Import Project="..\..\..\..\..\..\..\Udm_x64.props" />
+ <Import Project="..\..\..\..\..\..\..\Udm.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+ <Import Project="..\..\..\..\..\..\..\Udm.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
<Import Project="..\..\..\..\..\..\..\Udm_x64.props" />
+ <Import Project="..\..\..\..\..\..\..\Udm.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\..\..\..\Build\Win32\VC10\Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)obj\src\UdmOclPat\GOCL\src\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\..\..\..\Build\Win32\VC10\Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)obj\src\UdmOclPat\GOCL\src\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)D</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)D</TargetName>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
Modified: UDM/trunk/Projects/Win32/VC10/src/UdmPOI/UdmPOI.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/UdmPOI/UdmPOI.vcxproj Wed Oct 3 09:39:16 2012 (r4113)
+++ UDM/trunk/Projects/Win32/VC10/src/UdmPOI/UdmPOI.vcxproj Wed Oct 3 09:39:49 2012 (r4114)
@@ -50,31 +50,33 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
<Import Project="..\Xerces-c.props" />
+ <Import Project="..\..\..\..\..\Udm.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
<Import Project="..\Xerces-c.props" />
<Import Project="..\..\..\..\..\Udm_x64.props" />
+ <Import Project="..\..\..\..\..\Udm.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
<Import Project="..\Xerces-c.props" />
+ <Import Project="..\..\..\..\..\Udm.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
<Import Project="..\Xerces-c.props" />
<Import Project="..\..\..\..\..\Udm_x64.props" />
+ <Import Project="..\..\..\..\..\Udm.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\..\Build\Win32\VC10\Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)obj\src\$(ProjectName)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\..\Build\Win32\VC10\Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)obj\src\$(ProjectName)\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)D</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)D</TargetName>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
Modified: UDM/trunk/Projects/Win32/VC10/src/UdmUtil/UdmUtil.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/UdmUtil/UdmUtil.vcxproj Wed Oct 3 09:39:16 2012 (r4113)
+++ UDM/trunk/Projects/Win32/VC10/src/UdmUtil/UdmUtil.vcxproj Wed Oct 3 09:39:49 2012 (r4114)
@@ -48,28 +48,30 @@
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+ <Import Project="..\..\..\..\..\Udm.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
<Import Project="..\..\..\..\..\Udm_x64.props" />
+ <Import Project="..\..\..\..\..\Udm.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+ <Import Project="..\..\..\..\..\Udm.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
<Import Project="..\..\..\..\..\Udm_x64.props" />
+ <Import Project="..\..\..\..\..\Udm.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\..\Build\Win32\VC10\Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)obj\src\$(ProjectName)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\..\Build\Win32\VC10\Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)obj\src\$(ProjectName)\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)D</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)D</TargetName>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
Modified: UDM/trunk/Projects/Win32/VC10/src/UdmXmi/UdmXmi.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/UdmXmi/UdmXmi.vcxproj Wed Oct 3 09:39:16 2012 (r4113)
+++ UDM/trunk/Projects/Win32/VC10/src/UdmXmi/UdmXmi.vcxproj Wed Oct 3 09:39:49 2012 (r4114)
@@ -50,34 +50,38 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
<Import Project="..\Xerces-c.props" />
<Import Project="..\Xalan-c.props" />
+ <Import Project="..\..\..\..\..\Udm.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
<Import Project="..\Xerces-c.props" />
<Import Project="..\Xalan-c.props" />
<Import Project="..\..\..\..\..\Udm_x64.props" />
+ <Import Project="..\..\..\..\..\Udm.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
<Import Project="..\Xerces-c.props" />
<Import Project="..\Xalan-c.props" />
+ <Import Project="..\..\..\..\..\Udm.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
<Import Project="..\Xerces-c.props" />
<Import Project="..\Xalan-c.props" />
<Import Project="..\..\..\..\..\Udm_x64.props" />
+ <Import Project="..\..\..\..\..\Udm.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\..\Build\Win32\VC10\Debug\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)obj\src\$(ProjectName)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\..\Build\Win32\VC10\Release\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)obj\src\$(ProjectName)\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)D</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)D</TargetName>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
Added: UDM/trunk/Projects/Win32/VC10/src/Udmv110.sln
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ UDM/trunk/Projects/Win32/VC10/src/Udmv110.sln Wed Oct 3 09:39:49 2012 (r4114)
@@ -0,0 +1,185 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{33752962-5CB0-4E69-A474-EEB5EDE3BD35}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UdmBase", "UdmBase\UdmBase.vcxproj", "{30C55DA9-9CBA-4D6C-BBBD-C7E8823A027D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UdmDom", "UdmDom\UdmDom.vcxproj", "{9A094C52-E029-4333-AC60-580B9B928E4E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UdmUtil", "UdmUtil\UdmUtil.vcxproj", "{E663042B-F135-4502-B7A1-D62F21126E3B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UdmGme", "UdmGme\UdmGme.vcxproj", "{0763153D-E646-403A-93B7-6033B1D13A0C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UdmOcl", "UdmOcl\UdmOcl.vcxproj", "{5106C980-BC3D-48C5-A033-0D58C20F9980}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GOCL", "UdmOclPat\GOCL\src\GOCL.vcxproj", "{EE407066-7819-4AE2-B0F5-E64FC5E54415}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UdmPOI", "UdmPOI\UdmPOI.vcxproj", "{AA870453-DBEA-4162-9699-563A975E5A84}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Uml", "Uml\Uml.vcxproj", "{6A53E343-14C2-4463-A9C8-332DAE560EAF}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UdmXmi", "UdmXmi\UdmXmi.vcxproj", "{CA16ED97-F738-4FAF-985C-FAE05AED8D07}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UdmDllv110", "UdmDll\UdmDllv110.vcxproj", "{2C29618E-960B-41CE-82AD-983A49FFA29E}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ BootUdmCompile Debug|Win32 = BootUdmCompile Debug|Win32
+ BootUdmCompile Debug|x64 = BootUdmCompile Debug|x64
+ BootUdmCompile Release|Win32 = BootUdmCompile Release|Win32
+ BootUdmCompile Release|x64 = BootUdmCompile Release|x64
+ Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
+ Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {30C55DA9-9CBA-4D6C-BBBD-C7E8823A027D}.BootUdmCompile Debug|Win32.ActiveCfg = BootUdmCompile Debug|Win32
+ {30C55DA9-9CBA-4D6C-BBBD-C7E8823A027D}.BootUdmCompile Debug|Win32.Build.0 = BootUdmCompile Debug|Win32
+ {30C55DA9-9CBA-4D6C-BBBD-C7E8823A027D}.BootUdmCompile Debug|x64.ActiveCfg = BootUdmCompile Debug|x64
+ {30C55DA9-9CBA-4D6C-BBBD-C7E8823A027D}.BootUdmCompile Debug|x64.Build.0 = BootUdmCompile Debug|x64
+ {30C55DA9-9CBA-4D6C-BBBD-C7E8823A027D}.BootUdmCompile Release|Win32.ActiveCfg = BootUdmCompile Release|Win32
+ {30C55DA9-9CBA-4D6C-BBBD-C7E8823A027D}.BootUdmCompile Release|Win32.Build.0 = BootUdmCompile Release|Win32
+ {30C55DA9-9CBA-4D6C-BBBD-C7E8823A027D}.BootUdmCompile Release|x64.ActiveCfg = BootUdmCompile Release|x64
+ {30C55DA9-9CBA-4D6C-BBBD-C7E8823A027D}.BootUdmCompile Release|x64.Build.0 = BootUdmCompile Release|x64
+ {30C55DA9-9CBA-4D6C-BBBD-C7E8823A027D}.Debug|Win32.ActiveCfg = Debug|Win32
+ {30C55DA9-9CBA-4D6C-BBBD-C7E8823A027D}.Debug|Win32.Build.0 = Debug|Win32
+ {30C55DA9-9CBA-4D6C-BBBD-C7E8823A027D}.Debug|x64.ActiveCfg = Debug|x64
+ {30C55DA9-9CBA-4D6C-BBBD-C7E8823A027D}.Debug|x64.Build.0 = Debug|x64
+ {30C55DA9-9CBA-4D6C-BBBD-C7E8823A027D}.Release|Win32.ActiveCfg = Release|Win32
+ {30C55DA9-9CBA-4D6C-BBBD-C7E8823A027D}.Release|Win32.Build.0 = Release|Win32
+ {30C55DA9-9CBA-4D6C-BBBD-C7E8823A027D}.Release|x64.ActiveCfg = Release|x64
+ {30C55DA9-9CBA-4D6C-BBBD-C7E8823A027D}.Release|x64.Build.0 = Release|x64
+ {9A094C52-E029-4333-AC60-580B9B928E4E}.BootUdmCompile Debug|Win32.ActiveCfg = Debug|Win32
+ {9A094C52-E029-4333-AC60-580B9B928E4E}.BootUdmCompile Debug|x64.ActiveCfg = Debug|x64
+ {9A094C52-E029-4333-AC60-580B9B928E4E}.BootUdmCompile Debug|x64.Build.0 = Debug|x64
+ {9A094C52-E029-4333-AC60-580B9B928E4E}.BootUdmCompile Release|Win32.ActiveCfg = Release|Win32
+ {9A094C52-E029-4333-AC60-580B9B928E4E}.BootUdmCompile Release|x64.ActiveCfg = Release|x64
+ {9A094C52-E029-4333-AC60-580B9B928E4E}.BootUdmCompile Release|x64.Build.0 = Release|x64
+ {9A094C52-E029-4333-AC60-580B9B928E4E}.Debug|Win32.ActiveCfg = Debug|Win32
+ {9A094C52-E029-4333-AC60-580B9B928E4E}.Debug|Win32.Build.0 = Debug|Win32
+ {9A094C52-E029-4333-AC60-580B9B928E4E}.Debug|x64.ActiveCfg = Debug|x64
+ {9A094C52-E029-4333-AC60-580B9B928E4E}.Debug|x64.Build.0 = Debug|x64
+ {9A094C52-E029-4333-AC60-580B9B928E4E}.Release|Win32.ActiveCfg = Release|Win32
+ {9A094C52-E029-4333-AC60-580B9B928E4E}.Release|Win32.Build.0 = Release|Win32
+ {9A094C52-E029-4333-AC60-580B9B928E4E}.Release|x64.ActiveCfg = Release|x64
+ {9A094C52-E029-4333-AC60-580B9B928E4E}.Release|x64.Build.0 = Release|x64
+ {E663042B-F135-4502-B7A1-D62F21126E3B}.BootUdmCompile Debug|Win32.ActiveCfg = Debug|Win32
+ {E663042B-F135-4502-B7A1-D62F21126E3B}.BootUdmCompile Debug|x64.ActiveCfg = Debug|x64
+ {E663042B-F135-4502-B7A1-D62F21126E3B}.BootUdmCompile Debug|x64.Build.0 = Debug|x64
+ {E663042B-F135-4502-B7A1-D62F21126E3B}.BootUdmCompile Release|Win32.ActiveCfg = Release|Win32
+ {E663042B-F135-4502-B7A1-D62F21126E3B}.BootUdmCompile Release|x64.ActiveCfg = Release|x64
+ {E663042B-F135-4502-B7A1-D62F21126E3B}.BootUdmCompile Release|x64.Build.0 = Release|x64
+ {E663042B-F135-4502-B7A1-D62F21126E3B}.Debug|Win32.ActiveCfg = Debug|Win32
+ {E663042B-F135-4502-B7A1-D62F21126E3B}.Debug|Win32.Build.0 = Debug|Win32
+ {E663042B-F135-4502-B7A1-D62F21126E3B}.Debug|x64.ActiveCfg = Debug|x64
+ {E663042B-F135-4502-B7A1-D62F21126E3B}.Debug|x64.Build.0 = Debug|x64
+ {E663042B-F135-4502-B7A1-D62F21126E3B}.Release|Win32.ActiveCfg = Release|Win32
+ {E663042B-F135-4502-B7A1-D62F21126E3B}.Release|Win32.Build.0 = Release|Win32
+ {E663042B-F135-4502-B7A1-D62F21126E3B}.Release|x64.ActiveCfg = Release|x64
+ {E663042B-F135-4502-B7A1-D62F21126E3B}.Release|x64.Build.0 = Release|x64
+ {0763153D-E646-403A-93B7-6033B1D13A0C}.BootUdmCompile Debug|Win32.ActiveCfg = Debug|Win32
+ {0763153D-E646-403A-93B7-6033B1D13A0C}.BootUdmCompile Debug|x64.ActiveCfg = Debug|x64
+ {0763153D-E646-403A-93B7-6033B1D13A0C}.BootUdmCompile Debug|x64.Build.0 = Debug|x64
+ {0763153D-E646-403A-93B7-6033B1D13A0C}.BootUdmCompile Release|Win32.ActiveCfg = Release|Win32
+ {0763153D-E646-403A-93B7-6033B1D13A0C}.BootUdmCompile Release|x64.ActiveCfg = Release|x64
+ {0763153D-E646-403A-93B7-6033B1D13A0C}.BootUdmCompile Release|x64.Build.0 = Release|x64
+ {0763153D-E646-403A-93B7-6033B1D13A0C}.Debug|Win32.ActiveCfg = Debug|Win32
+ {0763153D-E646-403A-93B7-6033B1D13A0C}.Debug|Win32.Build.0 = Debug|Win32
+ {0763153D-E646-403A-93B7-6033B1D13A0C}.Debug|x64.ActiveCfg = Debug|x64
+ {0763153D-E646-403A-93B7-6033B1D13A0C}.Debug|x64.Build.0 = Debug|x64
+ {0763153D-E646-403A-93B7-6033B1D13A0C}.Release|Win32.ActiveCfg = Release|Win32
+ {0763153D-E646-403A-93B7-6033B1D13A0C}.Release|Win32.Build.0 = Release|Win32
+ {0763153D-E646-403A-93B7-6033B1D13A0C}.Release|x64.ActiveCfg = Release|x64
+ {0763153D-E646-403A-93B7-6033B1D13A0C}.Release|x64.Build.0 = Release|x64
+ {5106C980-BC3D-48C5-A033-0D58C20F9980}.BootUdmCompile Debug|Win32.ActiveCfg = Debug|Win32
+ {5106C980-BC3D-48C5-A033-0D58C20F9980}.BootUdmCompile Debug|x64.ActiveCfg = Debug|x64
+ {5106C980-BC3D-48C5-A033-0D58C20F9980}.BootUdmCompile Debug|x64.Build.0 = Debug|x64
+ {5106C980-BC3D-48C5-A033-0D58C20F9980}.BootUdmCompile Release|Win32.ActiveCfg = Release|Win32
+ {5106C980-BC3D-48C5-A033-0D58C20F9980}.BootUdmCompile Release|x64.ActiveCfg = Release|x64
+ {5106C980-BC3D-48C5-A033-0D58C20F9980}.BootUdmCompile Release|x64.Build.0 = Release|x64
+ {5106C980-BC3D-48C5-A033-0D58C20F9980}.Debug|Win32.ActiveCfg = Debug|Win32
+ {5106C980-BC3D-48C5-A033-0D58C20F9980}.Debug|Win32.Build.0 = Debug|Win32
+ {5106C980-BC3D-48C5-A033-0D58C20F9980}.Debug|x64.ActiveCfg = Debug|x64
+ {5106C980-BC3D-48C5-A033-0D58C20F9980}.Release|Win32.ActiveCfg = Release|Win32
+ {5106C980-BC3D-48C5-A033-0D58C20F9980}.Release|Win32.Build.0 = Release|Win32
+ {5106C980-BC3D-48C5-A033-0D58C20F9980}.Release|x64.ActiveCfg = Release|x64
+ {EE407066-7819-4AE2-B0F5-E64FC5E54415}.BootUdmCompile Debug|Win32.ActiveCfg = Debug|Win32
+ {EE407066-7819-4AE2-B0F5-E64FC5E54415}.BootUdmCompile Debug|x64.ActiveCfg = Debug|x64
+ {EE407066-7819-4AE2-B0F5-E64FC5E54415}.BootUdmCompile Debug|x64.Build.0 = Debug|x64
+ {EE407066-7819-4AE2-B0F5-E64FC5E54415}.BootUdmCompile Release|Win32.ActiveCfg = Release|Win32
+ {EE407066-7819-4AE2-B0F5-E64FC5E54415}.BootUdmCompile Release|x64.ActiveCfg = Release|x64
+ {EE407066-7819-4AE2-B0F5-E64FC5E54415}.BootUdmCompile Release|x64.Build.0 = Release|x64
+ {EE407066-7819-4AE2-B0F5-E64FC5E54415}.Debug|Win32.ActiveCfg = Debug|Win32
+ {EE407066-7819-4AE2-B0F5-E64FC5E54415}.Debug|Win32.Build.0 = Debug|Win32
+ {EE407066-7819-4AE2-B0F5-E64FC5E54415}.Debug|x64.ActiveCfg = Debug|x64
+ {EE407066-7819-4AE2-B0F5-E64FC5E54415}.Release|Win32.ActiveCfg = Release|Win32
+ {EE407066-7819-4AE2-B0F5-E64FC5E54415}.Release|Win32.Build.0 = Release|Win32
+ {EE407066-7819-4AE2-B0F5-E64FC5E54415}.Release|x64.ActiveCfg = Release|x64
+ {AA870453-DBEA-4162-9699-563A975E5A84}.BootUdmCompile Debug|Win32.ActiveCfg = Debug|Win32
+ {AA870453-DBEA-4162-9699-563A975E5A84}.BootUdmCompile Debug|x64.ActiveCfg = Debug|x64
+ {AA870453-DBEA-4162-9699-563A975E5A84}.BootUdmCompile Debug|x64.Build.0 = Debug|x64
+ {AA870453-DBEA-4162-9699-563A975E5A84}.BootUdmCompile Release|Win32.ActiveCfg = Release|Win32
+ {AA870453-DBEA-4162-9699-563A975E5A84}.BootUdmCompile Release|x64.ActiveCfg = Release|x64
+ {AA870453-DBEA-4162-9699-563A975E5A84}.BootUdmCompile Release|x64.Build.0 = Release|x64
+ {AA870453-DBEA-4162-9699-563A975E5A84}.Debug|Win32.ActiveCfg = Debug|Win32
+ {AA870453-DBEA-4162-9699-563A975E5A84}.Debug|Win32.Build.0 = Debug|Win32
+ {AA870453-DBEA-4162-9699-563A975E5A84}.Debug|x64.ActiveCfg = Debug|x64
+ {AA870453-DBEA-4162-9699-563A975E5A84}.Debug|x64.Build.0 = Debug|x64
+ {AA870453-DBEA-4162-9699-563A975E5A84}.Release|Win32.ActiveCfg = Release|Win32
+ {AA870453-DBEA-4162-9699-563A975E5A84}.Release|Win32.Build.0 = Release|Win32
+ {AA870453-DBEA-4162-9699-563A975E5A84}.Release|x64.ActiveCfg = Release|x64
+ {AA870453-DBEA-4162-9699-563A975E5A84}.Release|x64.Build.0 = Release|x64
+ {6A53E343-14C2-4463-A9C8-332DAE560EAF}.BootUdmCompile Debug|Win32.ActiveCfg = BootUdmCompile Debug|Win32
+ {6A53E343-14C2-4463-A9C8-332DAE560EAF}.BootUdmCompile Debug|Win32.Build.0 = BootUdmCompile Debug|Win32
+ {6A53E343-14C2-4463-A9C8-332DAE560EAF}.BootUdmCompile Debug|x64.ActiveCfg = BootUdmCompile Debug|x64
+ {6A53E343-14C2-4463-A9C8-332DAE560EAF}.BootUdmCompile Debug|x64.Build.0 = BootUdmCompile Debug|x64
+ {6A53E343-14C2-4463-A9C8-332DAE560EAF}.BootUdmCompile Release|Win32.ActiveCfg = BootUdmCompile Release|Win32
+ {6A53E343-14C2-4463-A9C8-332DAE560EAF}.BootUdmCompile Release|Win32.Build.0 = BootUdmCompile Release|Win32
+ {6A53E343-14C2-4463-A9C8-332DAE560EAF}.BootUdmCompile Release|x64.ActiveCfg = BootUdmCompile Release|x64
+ {6A53E343-14C2-4463-A9C8-332DAE560EAF}.BootUdmCompile Release|x64.Build.0 = BootUdmCompile Release|x64
+ {6A53E343-14C2-4463-A9C8-332DAE560EAF}.Debug|Win32.ActiveCfg = Debug|Win32
+ {6A53E343-14C2-4463-A9C8-332DAE560EAF}.Debug|Win32.Build.0 = Debug|Win32
+ {6A53E343-14C2-4463-A9C8-332DAE560EAF}.Debug|x64.ActiveCfg = Debug|x64
+ {6A53E343-14C2-4463-A9C8-332DAE560EAF}.Debug|x64.Build.0 = Debug|x64
+ {6A53E343-14C2-4463-A9C8-332DAE560EAF}.Release|Win32.ActiveCfg = Release|Win32
+ {6A53E343-14C2-4463-A9C8-332DAE560EAF}.Release|Win32.Build.0 = Release|Win32
+ {6A53E343-14C2-4463-A9C8-332DAE560EAF}.Release|x64.ActiveCfg = Release|x64
+ {6A53E343-14C2-4463-A9C8-332DAE560EAF}.Release|x64.Build.0 = Release|x64
+ {CA16ED97-F738-4FAF-985C-FAE05AED8D07}.BootUdmCompile Debug|Win32.ActiveCfg = Debug|Win32
+ {CA16ED97-F738-4FAF-985C-FAE05AED8D07}.BootUdmCompile Debug|Win32.Build.0 = Debug|Win32
+ {CA16ED97-F738-4FAF-985C-FAE05AED8D07}.BootUdmCompile Debug|x64.ActiveCfg = Debug|x64
+ {CA16ED97-F738-4FAF-985C-FAE05AED8D07}.BootUdmCompile Debug|x64.Build.0 = Debug|x64
+ {CA16ED97-F738-4FAF-985C-FAE05AED8D07}.BootUdmCompile Release|Win32.ActiveCfg = Release|Win32
+ {CA16ED97-F738-4FAF-985C-FAE05AED8D07}.BootUdmCompile Release|Win32.Build.0 = Release|Win32
+ {CA16ED97-F738-4FAF-985C-FAE05AED8D07}.BootUdmCompile Release|x64.ActiveCfg = Release|x64
+ {CA16ED97-F738-4FAF-985C-FAE05AED8D07}.BootUdmCompile Release|x64.Build.0 = Release|x64
+ {CA16ED97-F738-4FAF-985C-FAE05AED8D07}.Debug|Win32.ActiveCfg = Debug|Win32
+ {CA16ED97-F738-4FAF-985C-FAE05AED8D07}.Debug|Win32.Build.0 = Debug|Win32
+ {CA16ED97-F738-4FAF-985C-FAE05AED8D07}.Debug|x64.ActiveCfg = Debug|x64
+ {CA16ED97-F738-4FAF-985C-FAE05AED8D07}.Debug|x64.Build.0 = Debug|x64
+ {CA16ED97-F738-4FAF-985C-FAE05AED8D07}.Release|Win32.ActiveCfg = Release|Win32
+ {CA16ED97-F738-4FAF-985C-FAE05AED8D07}.Release|Win32.Build.0 = Release|Win32
+ {CA16ED97-F738-4FAF-985C-FAE05AED8D07}.Release|x64.ActiveCfg = Release|x64
+ {CA16ED97-F738-4FAF-985C-FAE05AED8D07}.Release|x64.Build.0 = Release|x64
+ {2C29618E-960B-41CE-82AD-983A49FFA29E}.BootUdmCompile Debug|Win32.ActiveCfg = Debug|Win32
+ {2C29618E-960B-41CE-82AD-983A49FFA29E}.BootUdmCompile Debug|Win32.Build.0 = Debug|Win32
+ {2C29618E-960B-41CE-82AD-983A49FFA29E}.BootUdmCompile Debug|x64.ActiveCfg = Debug|x64
+ {2C29618E-960B-41CE-82AD-983A49FFA29E}.BootUdmCompile Debug|x64.Build.0 = Debug|x64
+ {2C29618E-960B-41CE-82AD-983A49FFA29E}.BootUdmCompile Release|Win32.ActiveCfg = Release|Win32
+ {2C29618E-960B-41CE-82AD-983A49FFA29E}.BootUdmCompile Release|Win32.Build.0 = Release|Win32
+ {2C29618E-960B-41CE-82AD-983A49FFA29E}.BootUdmCompile Release|x64.ActiveCfg = Release|x64
+ {2C29618E-960B-41CE-82AD-983A49FFA29E}.BootUdmCompile Release|x64.Build.0 = Release|x64
+ {2C29618E-960B-41CE-82AD-983A49FFA29E}.Debug|Win32.ActiveCfg = Debug|Win32
+ {2C29618E-960B-41CE-82AD-983A49FFA29E}.Debug|Win32.Build.0 = Debug|Win32
+ {2C29618E-960B-41CE-82AD-983A49FFA29E}.Debug|x64.ActiveCfg = Debug|x64
+ {2C29618E-960B-41CE-82AD-983A49FFA29E}.Debug|x64.Build.0 = Debug|x64
+ {2C29618E-960B-41CE-82AD-983A49FFA29E}.Release|Win32.ActiveCfg = Release|Win32
+ {2C29618E-960B-41CE-82AD-983A49FFA29E}.Release|Win32.Build.0 = Release|Win32
+ {2C29618E-960B-41CE-82AD-983A49FFA29E}.Release|x64.ActiveCfg = Release|x64
+ {2C29618E-960B-41CE-82AD-983A49FFA29E}.Release|x64.Build.0 = Release|x64
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
Modified: UDM/trunk/Projects/Win32/VC10/src/Uml/Uml.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/Uml/Uml.vcxproj Wed Oct 3 09:39:16 2012 (r4113)
+++ UDM/trunk/Projects/Win32/VC10/src/Uml/Uml.vcxproj Wed Oct 3 09:39:49 2012 (r4114)
@@ -86,55 +86,53 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='BootUdmCompile Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
<Import Project="..\Xerces-c.props" />
+ <Import Project="..\..\..\..\..\Udm.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='BootUdmCompile Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
<Import Project="..\Xerces-c.props" />
+ <Import Project="..\..\..\..\..\Udm.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='BootUdmCompile Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
<Import Project="..\Xerces-c.props" />
+ <Import Project="..\..\..\..\..\Udm.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='BootUdmCompile Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
<Import Project="..\Xerces-c.props" />
+ <Import Project="..\..\..\..\..\Udm.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
<Import Project="..\Xerces-c.props" />
+ <Import Project="..\..\..\..\..\Udm.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
<Import Project="..\Xerces-c.props" />
<Import Project="..\..\..\..\..\Udm_x64.props" />
+ <Import Project="..\..\..\..\..\Udm.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
<Import Project="..\Xerces-c.props" />
+ <Import Project="..\..\..\..\..\Udm.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
<Import Project="..\Xerces-c.props" />
<Import Project="..\..\..\..\..\Udm_x64.props" />
+ <Import Project="..\..\..\..\..\Udm.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\..\Build\Win32\VC10\Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)obj\src\$(ProjectName)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\..\Build\Win32\VC10\Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)obj\src\$(ProjectName)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='BootUdmCompile Release|Win32'">..\..\..\..\..\Build\Win32\VC10\BootUdmCompileRelease\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='BootUdmCompile Release|x64'">..\..\..\..\..\Build\Win32\VC10\BootUdmCompileRelease\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='BootUdmCompile Release|Win32'">$(OutDir)obj\src\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='BootUdmCompile Release|x64'">$(OutDir)obj\src\$(ProjectName)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='BootUdmCompile Debug|Win32'">..\..\..\..\..\Build\Win32\VC10\BootUdmCompileDebug\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='BootUdmCompile Debug|x64'">..\..\..\..\..\Build\Win32\VC10\BootUdmCompileDebug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='BootUdmCompile Debug|Win32'">$(OutDir)obj\src\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='BootUdmCompile Debug|x64'">$(OutDir)obj\src\$(ProjectName)\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)D</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)D</TargetName>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
Added: UDM/trunk/Udm.props
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ UDM/trunk/Udm.props Wed Oct 3 09:39:49 2012 (r4114)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ImportGroup Label="PropertySheets" />
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <OutDir>$(MSBuildThisFileDirectory)Build\$(Platform)\$(PlatformToolset)\$(Configuration)\</OutDir>
+ <IntDir>$(MSBuildThisFileDirectory)Build\$(Platform)\$(PlatformToolset)\$(Configuration)\obj\src\$(ProjectName)\</IntDir>
+ </PropertyGroup>
+ <ItemDefinitionGroup />
+ <ItemGroup />
+</Project>
\ No newline at end of file
Modified: UDM/trunk/make.msbuild
==============================================================================
--- UDM/trunk/make.msbuild Wed Oct 3 09:39:16 2012 (r4113)
+++ UDM/trunk/make.msbuild Wed Oct 3 09:39:49 2012 (r4114)
@@ -43,6 +43,15 @@
<MSBuild Projects="Projects\Win32\VC10\tests\UdmTests.sln" Targets="Build" Properties="Configuration=Debug;Platform=x64" />
<MSBuild Projects="Projects\Win32\VC10\tests\UdmTests.sln" Targets="Build" Properties="Configuration=Release;Platform=x64" />
</Target>
+ <Target Name="BuildVS11" DependsOnTargets="CheckEnv">
+ <MSBuild Projects="Projects\Win32\VC10\src\Udmv110.sln" Targets="Build" Properties="VisualStudioVersion=11.0;PlatformToolset=v110;Configuration=Debug" />
+ <MSBuild Projects="Projects\Win32\VC10\src\Udmv110.sln" Targets="Build" Properties="VisualStudioVersion=11.0;PlatformToolset=v110;Configuration=Release" />
+ </Target>
+ <Target Name="BuildVS11_x64" DependsOnTargets="CheckEnv">
+ <MSBuild Projects="Projects\Win32\VC10\src\Udmv110.sln" Targets="Build" Properties="VisualStudioVersion=11.0;PlatformToolset=v110;Configuration=Debug;Platform=x64" />
+ <MSBuild Projects="Projects\Win32\VC10\src\Udmv110.sln" Targets="Build" Properties="VisualStudioVersion=11.0;PlatformToolset=v110;Configuration=Release;Platform=x64" />
+ </Target>
+
<Target Name="UdmCliGen" DependsOnTargets="CheckEnv">
<MSBuild Projects="src\UdmCliGen\make.msbuild"/>
</Target>
More information about the Mobies-commit
mailing list