Merge pull request #58 from rfw/patch-1

[libcds.git] / projects / Win / vc12 / unit-prerequisites.vcxproj

diff --git a/projects/Win/vc12/unit-prerequisites.vcxproj b/projects/Win/vc12/unit-prerequisites.vcxproj
index 7c1bc845e9401c3bf5d45ff3dde0a14df20f40e3..e9f737c4b56e80121a32924a9b5669f7ded0246f 100644 (file)
--- a/projects/Win/vc12/unit-prerequisites.vcxproj
+++ b/projects/Win/vc12/unit-prerequisites.vcxproj
@@ -151,11 +151,11 @@
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\..\..\obj\vc12\$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='ICL-Debug|x64'">$(SolutionDir)..\..\..\obj\vc12-icl\$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='DebugVLD|x64'">$(SolutionDir)..\..\..\obj\vc12\$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\..\..\bin\vc12\$(Platform)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\..\..\bin\vc12\$(Platform)-release\</OutDir>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='ICL-Release|Win32'">$(SolutionDir)..\..\..\bin\vc12-icl\$(Platform)\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\..\..\obj\vc12\$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='ICL-Release|Win32'">$(SolutionDir)..\..\..\obj\vc12-icl\$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\..\..\bin\vc12\$(Platform)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\..\..\bin\vc12\$(Platform)-release\</OutDir>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='ICL-Release|x64'">$(SolutionDir)..\..\..\bin\vc12-icl\$(Platform)\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\..\..\obj\vc12\$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='ICL-Release|x64'">$(SolutionDir)..\..\..\obj\vc12-icl\$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>\r
@@ -417,17 +417,24 @@
     <ClInclude Include="..\..\..\tests\cppunit\file_reporter.h" />\r
     <ClInclude Include="..\..\..\tests\hashing\city.h" />\r
     <ClInclude Include="..\..\..\tests\hashing\hash_func.h" />\r
-    <ClInclude Include="..\..\..\tests\hashing\md5.h" />\r
-    <ClInclude Include="..\..\..\tests\hashing\sha256.h" />\r
     <ClInclude Include="..\..\..\tests\unit\ellen_bintree_update_desc_pool.h" />\r
     <ClInclude Include="..\..\..\tests\unit\michael_alloc.h" />\r
     <ClInclude Include="..\..\..\tests\cppunit\test_beans.h" />\r
     <ClInclude Include="..\..\..\tests\cppunit\thread.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ClCompile Include="..\..\..\tests\hashing\city.cpp" />\r
-    <ClCompile Include="..\..\..\tests\hashing\md5.cpp" />\r
-    <ClCompile Include="..\..\..\tests\hashing\sha256.cpp" />\r
+    <ClCompile Include="..\..\..\tests\hashing\city.cpp">\r
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level2</WarningLevel>\r
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugVLD|Win32'">Level2</WarningLevel>\r
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ICL-Release|Win32'">Level2</WarningLevel>\r
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ICL-Debug|Win32'">Level2</WarningLevel>\r
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level2</WarningLevel>\r
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level2</WarningLevel>\r
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugVLD|x64'">Level2</WarningLevel>\r
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ICL-Release|x64'">Level2</WarningLevel>\r
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ICL-Debug|x64'">Level2</WarningLevel>\r
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level2</WarningLevel>\r
+    </ClCompile>\r
     <ClCompile Include="..\..\..\tests\unit\ellen_bintree_update_desc_pool.cpp" />\r
     <ClCompile Include="..\..\..\tests\unit\michael_alloc.cpp" />\r
     <ClCompile Include="..\..\..\tests\cppunit\test_main.cpp">\r