[Mobies-commit] [commit] r3845 - in UDM/trunk/Projects/Win32/VC10/tests: testOCL testUdmCint

[ksmyth at redhat1.isis.vanderbilt.edu]

Author: ksmyth
Date: Thu Aug 25 14:57:13 2011
New Revision: 3845

Log:
Fix some tests

Modified:
   UDM/trunk/Projects/Win32/VC10/tests/testOCL/testOCL.vcxproj
   UDM/trunk/Projects/Win32/VC10/tests/testUdmCint/testUdmCint.vcxproj

Modified: UDM/trunk/Projects/Win32/VC10/tests/testOCL/testOCL.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/testOCL/testOCL.vcxproj	Thu Aug 25 14:41:53 2011	(r3844)
+++ UDM/trunk/Projects/Win32/VC10/tests/testOCL/testOCL.vcxproj	Thu Aug 25 14:57:13 2011	(r3845)
@@ -30,12 +30,12 @@
   <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="..\cppunit.props" />
-    <Import Project="..\..\src\Xerces-c.props" />
+    <Import Project="..\UdmTests.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="..\cppunit.props" />
-    <Import Project="..\..\src\Xerces-c.props" />
+    <Import Project="..\UdmTests.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -47,6 +47,7 @@
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)obj\tests\$(ProjectName)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)D</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <PreBuildEvent>
@@ -68,8 +69,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>UdmDllD.lib;cppunitd.lib;testrunnerd.lib;Xalan-C_1d.lib;xerces-c_2d.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testOCLD.exe</OutputFile>
+      <AdditionalDependencies>cppunitd.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)testOCL.pdb</ProgramDatabaseFile>
@@ -102,7 +102,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>cppunit.lib;xerces-c_2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)testOCL.exe</OutputFile>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -170,4 +170,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

Modified: UDM/trunk/Projects/Win32/VC10/tests/testUdmCint/testUdmCint.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/testUdmCint/testUdmCint.vcxproj	Thu Aug 25 14:41:53 2011	(r3844)
+++ UDM/trunk/Projects/Win32/VC10/tests/testUdmCint/testUdmCint.vcxproj	Thu Aug 25 14:57:13 2011	(r3845)
@@ -35,6 +35,7 @@
     <Import Project="..\..\src\Xalan-c.props" />
     <Import Project="..\..\src\Xerces-c.props" />
     <Import Project="..\..\src\zlib.props" />
+    <Import Project="..\UdmTests.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')" />
@@ -42,6 +43,7 @@
     <Import Project="..\..\src\Xalan-c.props" />
     <Import Project="..\..\src\Xerces-c.props" />
     <Import Project="..\..\src\zlib.props" />
+    <Import Project="..\UdmTests.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -53,6 +55,7 @@
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)obj\tests\$(ProjectName)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)D</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <PreBuildEvent>
@@ -86,8 +89,7 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>UmlD.lib;UdmOcld.lib;GOCLd.lib;cppunitd.lib;testrunnerd.lib;UdmPOID.lib;Xalan-C_1d.lib;xerces-c_2d.lib;UdmBaseD.lib;UdmDomD.lib;UdmUtilD.lib;zlibd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testUdmCintD.exe</OutputFile>
+      <AdditionalDependencies>UdmPOID.lib;cppunitd.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -137,7 +139,7 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>Uml.lib;UdmOcl.lib;GOCL.lib;cppunit.lib;UdmPOI.lib;Xalan-C_1.lib;xerces-c_2.lib;UdmBase.lib;UdmDom.lib;UdmGme.lib;UdmUtil.lib;zlib.lib</AdditionalDependencies>
+      <AdditionalDependencies>UdmPOI.lib;cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>$(IntDir)testUdmCint.pdb</ProgramDatabaseFile>
@@ -250,4 +252,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file