You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2013/08/26 23:08:36 UTC
svn commit: r1517699 - in
/activemq/activemq-cpp/trunk/activemq-cpp/vs2010-build:
activemq-cpp-example.vcxproj activemq-cpp-integration-tests.vcxproj
activemq-cpp-unit-tests.vcxproj activemq-cpp.vcxproj
Author: tabish
Date: Mon Aug 26 21:08:35 2013
New Revision: 1517699
URL: http://svn.apache.org/r1517699
Log:
https://issues.apache.org/jira/browse/AMQCPP-507
Better output structure more work on x64 build configs
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/vs2010-build/activemq-cpp-example.vcxproj
activemq/activemq-cpp/trunk/activemq-cpp/vs2010-build/activemq-cpp-integration-tests.vcxproj
activemq/activemq-cpp/trunk/activemq-cpp/vs2010-build/activemq-cpp-unit-tests.vcxproj
activemq/activemq-cpp/trunk/activemq-cpp/vs2010-build/activemq-cpp.vcxproj
Modified: activemq/activemq-cpp/trunk/activemq-cpp/vs2010-build/activemq-cpp-example.vcxproj
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/vs2010-build/activemq-cpp-example.vcxproj?rev=1517699&r1=1517698&r2=1517699&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/vs2010-build/activemq-cpp-example.vcxproj (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/vs2010-build/activemq-cpp-example.vcxproj Mon Aug 26 21:08:35 2013
@@ -127,18 +127,18 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
- <OutDir>$(SolutionDir)$(ProjectName)\$(PlatformName)\</OutDir>
- <IntDir>$(SolutionDir)$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
+ <OutDir>$(SolutionDir)\$(PlatformName)\$(Configuration)\</OutDir>
+ <IntDir>$(SolutionDir)\$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'">
<LinkIncremental>true</LinkIncremental>
- <OutDir>$(SolutionDir)$(ProjectName)\$(PlatformName)\</OutDir>
- <IntDir>$(SolutionDir)$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
+ <OutDir>$(SolutionDir)\$(PlatformName)\$(Configuration)\</OutDir>
+ <IntDir>$(SolutionDir)\$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
- <OutDir>$(SolutionDir)$(ProjectName)\$(PlatformName)\</OutDir>
- <IntDir>$(SolutionDir)$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
+ <OutDir>$(SolutionDir)\$(PlatformName)\$(Configuration)\</OutDir>
+ <IntDir>$(SolutionDir)\$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'">
<LinkIncremental>true</LinkIncremental>
@@ -147,13 +147,13 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
- <OutDir>$(SolutionDir)$(ProjectName)\$(PlatformName)\</OutDir>
- <IntDir>$(SolutionDir)$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
+ <OutDir>$(SolutionDir)\$(PlatformName)\$(Configuration)\</OutDir>
+ <IntDir>$(SolutionDir)\$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'">
<LinkIncremental>false</LinkIncremental>
- <OutDir>$(SolutionDir)$(ProjectName)\$(PlatformName)\</OutDir>
- <IntDir>$(SolutionDir)$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
+ <OutDir>$(SolutionDir)\$(PlatformName)\$(Configuration)\</OutDir>
+ <IntDir>$(SolutionDir)\$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
Modified: activemq/activemq-cpp/trunk/activemq-cpp/vs2010-build/activemq-cpp-integration-tests.vcxproj
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/vs2010-build/activemq-cpp-integration-tests.vcxproj?rev=1517699&r1=1517698&r2=1517699&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/vs2010-build/activemq-cpp-integration-tests.vcxproj (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/vs2010-build/activemq-cpp-integration-tests.vcxproj Mon Aug 26 21:08:35 2013
@@ -238,18 +238,18 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
- <OutDir>$(SolutionDir)$(ProjectName)\$(PlatformName)\</OutDir>
- <IntDir>$(SolutionDir)$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
+ <OutDir>$(SolutionDir)\$(PlatformName)\$(Configuration)\</OutDir>
+ <IntDir>$(SolutionDir)\$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'">
<LinkIncremental>true</LinkIncremental>
- <OutDir>$(SolutionDir)$(ProjectName)\$(PlatformName)\</OutDir>
- <IntDir>$(SolutionDir)$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
+ <OutDir>$(SolutionDir)\$(PlatformName)\$(Configuration)\</OutDir>
+ <IntDir>$(SolutionDir)\$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
- <OutDir>$(SolutionDir)$(ProjectName)\$(PlatformName)\</OutDir>
- <IntDir>$(SolutionDir)$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
+ <OutDir>$(SolutionDir)\$(PlatformName)\$(Configuration)\</OutDir>
+ <IntDir>$(SolutionDir)\$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'">
<LinkIncremental>true</LinkIncremental>
@@ -258,13 +258,13 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
- <OutDir>$(SolutionDir)$(ProjectName)\$(PlatformName)\</OutDir>
- <IntDir>$(SolutionDir)$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
+ <OutDir>$(SolutionDir)\$(PlatformName)\$(Configuration)\</OutDir>
+ <IntDir>$(SolutionDir)\$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'">
<LinkIncremental>false</LinkIncremental>
- <OutDir>$(SolutionDir)$(ProjectName)\$(PlatformName)\</OutDir>
- <IntDir>$(SolutionDir)$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
+ <OutDir>$(SolutionDir)\$(PlatformName)\$(Configuration)\</OutDir>
+ <IntDir>$(SolutionDir)\$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
Modified: activemq/activemq-cpp/trunk/activemq-cpp/vs2010-build/activemq-cpp-unit-tests.vcxproj
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/vs2010-build/activemq-cpp-unit-tests.vcxproj?rev=1517699&r1=1517698&r2=1517699&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/vs2010-build/activemq-cpp-unit-tests.vcxproj (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/vs2010-build/activemq-cpp-unit-tests.vcxproj Mon Aug 26 21:08:35 2013
@@ -607,18 +607,18 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
- <OutDir>$(SolutionDir)$(ProjectName)\$(PlatformName)\</OutDir>
- <IntDir>$(SolutionDir)$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
+ <OutDir>$(SolutionDir)\$(PlatformName)\$(Configuration)\</OutDir>
+ <IntDir>$(SolutionDir)\$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'">
<LinkIncremental>true</LinkIncremental>
- <OutDir>$(SolutionDir)$(ProjectName)\$(PlatformName)\</OutDir>
- <IntDir>$(SolutionDir)$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
+ <OutDir>$(SolutionDir)\$(PlatformName)\$(Configuration)\</OutDir>
+ <IntDir>$(SolutionDir)\$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
- <OutDir>$(SolutionDir)$(ProjectName)\$(PlatformName)\</OutDir>
- <IntDir>$(SolutionDir)$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
+ <OutDir>$(SolutionDir)\$(PlatformName)\$(Configuration)\</OutDir>
+ <IntDir>$(SolutionDir)\$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'">
<LinkIncremental>true</LinkIncremental>
@@ -627,13 +627,13 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
- <OutDir>$(SolutionDir)$(ProjectName)\$(PlatformName)\</OutDir>
- <IntDir>$(SolutionDir)$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
+ <OutDir>$(SolutionDir)\$(PlatformName)\$(Configuration)\</OutDir>
+ <IntDir>$(SolutionDir)\$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'">
<LinkIncremental>false</LinkIncremental>
- <OutDir>$(SolutionDir)$(ProjectName)\$(PlatformName)\</OutDir>
- <IntDir>$(SolutionDir)$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
+ <OutDir>$(SolutionDir)\$(PlatformName)\$(Configuration)\</OutDir>
+ <IntDir>$(SolutionDir)\$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
Modified: activemq/activemq-cpp/trunk/activemq-cpp/vs2010-build/activemq-cpp.vcxproj
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/vs2010-build/activemq-cpp.vcxproj?rev=1517699&r1=1517698&r2=1517699&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/vs2010-build/activemq-cpp.vcxproj (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/vs2010-build/activemq-cpp.vcxproj Mon Aug 26 21:08:35 2013
@@ -1880,27 +1880,27 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <OutDir>$(SolutionDir)$(ProjectName)\$(PlatformName)\</OutDir>
+ <OutDir>$(SolutionDir)\$(PlatformName)\$(Configuration)\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'">
- <OutDir>$(SolutionDir)$(ProjectName)\$(PlatformName)\</OutDir>
+ <OutDir>$(SolutionDir)\$(PlatformName)\$(Configuration)\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <OutDir>$(SolutionDir)$(ProjectName)\$(PlatformName)\</OutDir>
+ <OutDir>$(SolutionDir)\$(PlatformName)\$(Configuration)\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'">
<OutDir>$(SolutionDir)$(ProjectName)\$(PlatformName)\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <IntDir>$(SolutionDir)$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
+ <IntDir>$(SolutionDir)\$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
<TargetName>libactivemq-cppd</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'">
- <IntDir>$(SolutionDir)$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
+ <IntDir>$(SolutionDir)\$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
<TargetName>activemq-cppd</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <IntDir>$(SolutionDir)$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
+ <IntDir>$(SolutionDir)\$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
<TargetName>libactivemq-cppd</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'">
@@ -1908,10 +1908,10 @@
<TargetName>libactivemq-cppd</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <OutDir>$(SolutionDir)$(ProjectName)\$(PlatformName)\</OutDir>
+ <OutDir>$(SolutionDir)\$(PlatformName)\$(Configuration)\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'">
- <OutDir>$(SolutionDir)$(ProjectName)\$(PlatformName)\</OutDir>
+ <OutDir>$(SolutionDir)\$(PlatformName)\$(Configuration)\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<OutDir>$(SolutionDir)$(ProjectName)\$(PlatformName)\</OutDir>
@@ -1920,11 +1920,11 @@
<OutDir>$(SolutionDir)$(ProjectName)\$(PlatformName)\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <IntDir>$(SolutionDir)$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
+ <IntDir>$(SolutionDir)\$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
<TargetName>libactivemq-cpp</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'">
- <IntDir>$(SolutionDir)$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
+ <IntDir>$(SolutionDir)\$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
<TargetName>activemq-cpp</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -1977,7 +1977,7 @@
</PrecompiledHeaderFile>
<PrecompiledHeaderOutputFile>
</PrecompiledHeaderOutputFile>
- <DisableSpecificWarnings>4355,4521</DisableSpecificWarnings>
+ <DisableSpecificWarnings>4355;4251</DisableSpecificWarnings>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@@ -2083,7 +2083,7 @@
</PrecompiledHeaderFile>
<PrecompiledHeaderOutputFile>
</PrecompiledHeaderOutputFile>
- <DisableSpecificWarnings>4355,4521</DisableSpecificWarnings>
+ <DisableSpecificWarnings>4355;4251</DisableSpecificWarnings>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>