https://issues.apache.org/jira/browse/AMQCPP-507

some improvements to the build git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-cpp/trunk@1516636 13f79535-47bb-0310-9956-ffa450edef68
apache · Aug 22, 2013 · 19c0785 · 19c0785
1 parent 1df40b0
commit 19c0785
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 6 deletions.
diff --git a/activemq-cpp/vs2010-build/activemq-cpp-example.vcxproj b/activemq-cpp/vs2010-build/activemq-cpp-example.vcxproj
@@ -71,7 +71,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>$(APR_DIST)\$(PlatformName)\lib;$(APR_DIST)\$(PlatformName)\bin;$(CPPUNIT_DIST)\$(PlatformName)\lib;$(PLATFORM_SDK)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(APR_DIST)\$(PlatformName)\lib;$(APR_DIST)\$(PlatformName)\bin;$(CPPUNIT_DIST)\$(PlatformName)\lib;$(PLATFORM_SDK)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>libapr-1.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ShowProgress>LinkVerboseLib</ShowProgress>
     </Link>
@@ -96,7 +96,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(APR_DIST)\$(PlatformName)\lib;$(APR_DIST)\$(PlatformName)\bin;$(CPPUNIT_DIST)\$(PlatformName)\lib;$(PLATFORM_SDK)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(APR_DIST)\$(PlatformName)\lib;$(APR_DIST)\$(PlatformName)\bin;$(CPPUNIT_DIST)\$(PlatformName)\lib;$(PLATFORM_SDK)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>libapr-1.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>

diff --git a/activemq-cpp/vs2010-build/activemq-cpp-integration-tests.vcxproj b/activemq-cpp/vs2010-build/activemq-cpp-integration-tests.vcxproj
@@ -129,6 +129,11 @@
     <ClInclude Include="..\src\test-integration\activemq\util\IntegrationCommon.h" />
     <ClInclude Include="..\src\test-integration\util\teamcity\TeamCityProgressListener.h" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="activemq-cpp.vcxproj">
+      <Project>{5e5a9e11-9f2f-4819-ae41-cca7d6029197}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{C3ADFAF2-12C2-4915-ADBE-F36D6905F82E}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
@@ -158,21 +163,30 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)$(ProjectName)\$(PlatformName)\</OutDir>
+    <IntDir>$(SolutionDir)$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)$(ProjectName)\$(PlatformName)\</OutDir>
+    <IntDir>$(SolutionDir)$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;HAVE_WINSOCK2_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <AdditionalIncludeDirectories>..\src\test-integration;..\src\main;$(APR_DIST)\$(PlatformName)\include;$(CPPUNIT_DIST)\$(PlatformName)\include;$(PLATFORM_SDK)\include</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>4101</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>ws2_32.lib;cppunitd.lib;libapr-1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(APR_DIST)\$(PlatformName)\lib;$(APR_DIST)\$(PlatformName)\bin;$(CPPUNIT_DIST)\$(PlatformName)\lib;$(PLATFORM_SDK)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -183,13 +197,18 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;WIN32_LEAN_AND_MEAN;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;HAVE_WINSOCK2_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <AdditionalIncludeDirectories>..\src\test-integration;..\src\main;$(APR_DIST)\$(PlatformName)\include;$(CPPUNIT_DIST)\$(PlatformName)\include;$(PLATFORM_SDK)\include</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>4101</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>ws2_32.lib;cppunit.lib;libapr-1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(APR_DIST)\$(PlatformName)\lib;$(APR_DIST)\$(PlatformName)\bin;$(CPPUNIT_DIST)\$(PlatformName)\lib;$(PLATFORM_SDK)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

diff --git a/activemq-cpp/vs2010-build/activemq-cpp-unit-tests.vcxproj b/activemq-cpp/vs2010-build/activemq-cpp-unit-tests.vcxproj
@@ -50,8 +50,10 @@
     <ClCompile Include="..\src\test\activemq\transport\correlator\ResponseCorrelatorTest.cpp" />
     <ClCompile Include="..\src\test\activemq\transport\failover\FailoverTransportTest.cpp" />
     <ClCompile Include="..\src\test\activemq\transport\inactivity\InactivityMonitorTest.cpp" />
+    <ClCompile Include="..\src\test\activemq\transport\IOTransportTest.cpp" />
     <ClCompile Include="..\src\test\activemq\transport\mock\MockTransportFactoryTest.cpp" />
     <ClCompile Include="..\src\test\activemq\transport\tcp\TcpTransportTest.cpp" />
+    <ClCompile Include="..\src\test\activemq\transport\TransportRegistryTest.cpp" />
     <ClCompile Include="..\src\test\activemq\util\ActiveMQMessageTransformationTest.cpp" />
     <ClCompile Include="..\src\test\activemq\util\AdvisorySupportTest.cpp" />
     <ClCompile Include="..\src\test\activemq\util\IdGeneratorTest.cpp" />
@@ -297,8 +299,10 @@
     <ClInclude Include="..\src\test\activemq\transport\correlator\ResponseCorrelatorTest.h" />
     <ClInclude Include="..\src\test\activemq\transport\failover\FailoverTransportTest.h" />
     <ClInclude Include="..\src\test\activemq\transport\inactivity\InactivityMonitorTest.h" />
+    <ClInclude Include="..\src\test\activemq\transport\IOTransportTest.h" />
     <ClInclude Include="..\src\test\activemq\transport\mock\MockTransportFactoryTest.h" />
     <ClInclude Include="..\src\test\activemq\transport\tcp\TcpTransportTest.h" />
+    <ClInclude Include="..\src\test\activemq\transport\TransportRegistryTest.h" />
     <ClInclude Include="..\src\test\activemq\util\ActiveMQMessageTransformationTest.h" />
     <ClInclude Include="..\src\test\activemq\util\AdvisorySupportTest.h" />
     <ClInclude Include="..\src\test\activemq\util\IdGeneratorTest.h" />
@@ -494,6 +498,11 @@
     <ClInclude Include="..\src\test\decaf\util\zip\InflaterTest.h" />
     <ClInclude Include="..\src\test\util\teamcity\TeamCityProgressListener.h" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="activemq-cpp.vcxproj">
+      <Project>{5e5a9e11-9f2f-4819-ae41-cca7d6029197}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{7A4B01E3-C410-4024-BC42-D80976CAF23D}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
@@ -523,21 +532,30 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)$(ProjectName)\$(PlatformName)\</OutDir>
+    <IntDir>$(SolutionDir)$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)$(ProjectName)\$(PlatformName)\</OutDir>
+    <IntDir>$(SolutionDir)$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;HAVE_WINSOCK2_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <AdditionalIncludeDirectories>..\src\test;..\src\main;$(APR_DIST)\$(PlatformName)\include;$(CPPUNIT_DIST)\$(PlatformName)\include;$(PLATFORM_SDK)\include</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>4101</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>$(APR_DIST)\$(PlatformName)\lib;$(APR_DIST)\$(PlatformName)\bin;$(CPPUNIT_DIST)\$(PlatformName)\lib;$(PLATFORM_SDK)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>ws2_32.lib;cppunitd.lib;libapr-1.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -548,13 +566,18 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;WIN32_LEAN_AND_MEAN;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;HAVE_WINSOCK2_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <AdditionalIncludeDirectories>..\src\test;..\src\main;$(APR_DIST)\$(PlatformName)\include;$(CPPUNIT_DIST)\$(PlatformName)\include;$(PLATFORM_SDK)\include</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>4101</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalLibraryDirectories>$(APR_DIST)\$(PlatformName)\lib;$(APR_DIST)\$(PlatformName)\bin;$(CPPUNIT_DIST)\$(PlatformName)\lib;$(PLATFORM_SDK)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>ws2_32.lib;cppunit.lib;libapr-1.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

diff --git a/activemq-cpp/vs2010-build/activemq-cpp-unit-tests.vcxproj.filters b/activemq-cpp/vs2010-build/activemq-cpp-unit-tests.vcxproj.filters
@@ -839,6 +839,12 @@
     <ClCompile Include="..\src\test\decaf\nio\BufferTest.cpp">
       <Filter>decaf\nio</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\test\activemq\transport\IOTransportTest.cpp">
+      <Filter>activemq\transport</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\test\activemq\transport\TransportRegistryTest.cpp">
+      <Filter>activemq\transport</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\src\test\util\teamcity\TeamCityProgressListener.h">
@@ -1570,5 +1576,11 @@
     <ClInclude Include="..\src\test\decaf\nio\BufferTest.h">
       <Filter>decaf\nio</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\test\activemq\transport\IOTransportTest.h">
+      <Filter>activemq\transport</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\test\activemq\transport\TransportRegistryTest.h">
+      <Filter>activemq\transport</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>