Merge from trunk tag to-cmake-25mar09 (r758432)

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/cmake@758465 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 70 insertions, 28 deletions

diff --git a/qpid/cpp/src/qmfconsole.vcproj b/qpid/cpp/src/qmfconsole.vcproj
index c37055adec..d2f79af64b 100644
--- a/qpid/cpp/src/qmfconsole.vcproj
+++ b/qpid/cpp/src/qmfconsole.vcproj
@@ -43,8 +43,8 @@
 		<Configuration

 			Name="Debug|Win32"

 			OutputDirectory="."

-			IntermediateDirectory="Static_Debug\qmfconsole\I386"

-			ConfigurationType="4"

+			IntermediateDirectory="Debug\qmfconsole\I386"

+			ConfigurationType="2"

 			CharacterSet="0"

 

 			>

@@ -73,10 +73,10 @@
 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"

-                                PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN"

+                                PreprocessorDefinitions="CONSOLE_EXPORT;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;BOOST_ALL_DYN_LINK"

 				MinimalRebuild="false"

 				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

+				RuntimeLibrary="3"

 				RuntimeTypeInfo="true"

 				WarningLevel="3"

 				Detect64BitPortabilityProblems="false"

@@ -88,7 +88,7 @@
 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN"

+				PreprocessorDefinitions="_DEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;BOOST_ALL_DYN_LINK"

 				Culture="1033"

 				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"

 			/>

@@ -96,8 +96,16 @@
 				Name="VCPreLinkEventTool"

 			/>

 			<Tool

-				Name="VCLibrarianTool"

-				OutputFile=".\qmfconsolesd.lib"

+				Name="VCLinkerTool"

+				AdditionalDependencies="qpidcommond.lib qpidclientd.lib"

+				OutputFile="$(OutDir)\qmfconsoled.dll"

+				LinkIncremental="2"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories=".;$(BOOST_ROOT)\lib"

+				GenerateDebugInformation="true"

+				SubSystem="2"

+				ImportLibrary=".\qmfconsoled.lib"

+				TargetMachine="1"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -113,13 +121,14 @@
 			/>

 			<Tool

 				Name="VCPostBuildEventTool"

+				CommandLine="@if not exist deploy\include\qpid\console mkdir deploy\include\qpid\console&#x0D;&#x0A;@if not exist deploy\lib mkdir deploy\lib&#x0D;&#x0A;&#x0D;&#x0A;@copy /Y qpid\console\*.h deploy\include\qpid\console\&#x0D;&#x0A;&#x0D;&#x0A;@copy /Y $(OutDir)\qmfconsoled.dll deploy\lib\&#x0D;&#x0A;@copy /Y .\qmfconsoled.lib deploy\lib\&#x0D;&#x0A;"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

 			OutputDirectory="."

-			IntermediateDirectory="Static_Release\qmfconsole\I386"

-			ConfigurationType="4"

+			IntermediateDirectory="Release\qmfconsole\I386"

+			ConfigurationType="2"

 			CharacterSet="0"

 

 			>

@@ -148,8 +157,8 @@
 				Name="VCCLCompilerTool"

 				Optimization="2"

 				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"

-                                PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN"

-				RuntimeLibrary="0"

+                                PreprocessorDefinitions="CONSOLE_EXPORT;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;BOOST_ALL_DYN_LINK"

+				RuntimeLibrary="2"

 				RuntimeTypeInfo="true"

 				WarningLevel="3"

 				Detect64BitPortabilityProblems="false"

@@ -160,7 +169,7 @@
 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN"

+				PreprocessorDefinitions="NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;BOOST_ALL_DYN_LINK"

 				Culture="1033"

 				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"

 			/>

@@ -168,8 +177,18 @@
 				Name="VCPreLinkEventTool"

 			/>

 			<Tool

-				Name="VCLibrarianTool"

-				OutputFile=".\qmfconsoles.lib"

+				Name="VCLinkerTool"

+				AdditionalDependencies="qpidcommon.lib qpidclient.lib"

+				OutputFile="$(OutDir)\qmfconsole.dll"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories=".;$(BOOST_ROOT)\lib"

+				GenerateDebugInformation="true"

+				SubSystem="2"

+				OptimizeReferences="2"

+				EnableCOMDATFolding="2"

+				ImportLibrary=".\qmfconsole.lib"

+				TargetMachine="1"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -185,13 +204,14 @@
 			/>

 			<Tool

 				Name="VCPostBuildEventTool"

+				CommandLine="@if not exist deploy\include\qpid\console mkdir deploy\include\qpid\console&#x0D;&#x0A;@if not exist deploy\lib mkdir deploy\lib&#x0D;&#x0A;&#x0D;&#x0A;@copy /Y qpid\console\*.h deploy\include\qpid\console\&#x0D;&#x0A;&#x0D;&#x0A;@copy /Y $(OutDir)\qmfconsole.dll deploy\lib\&#x0D;&#x0A;@copy /Y .\qmfconsole.lib deploy\lib\&#x0D;&#x0A;"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Debug|x64"

 			OutputDirectory="."

-			IntermediateDirectory="Static_Debug\qmfconsole\AMD64"

-			ConfigurationType="4"

+			IntermediateDirectory="Debug\qmfconsole\AMD64"

+			ConfigurationType="2"

 			CharacterSet="0"

 

 			>

@@ -220,10 +240,10 @@
 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"

-                                PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;NOMINMAX;WIN32_LEAN_AND_MEAN"

+                                PreprocessorDefinitions="CONSOLE_EXPORT;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;NOMINMAX;WIN32_LEAN_AND_MEAN;BOOST_ALL_DYN_LINK"

 				MinimalRebuild="false"

 				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

+				RuntimeLibrary="3"

 				RuntimeTypeInfo="true"

 				WarningLevel="3"

 				Detect64BitPortabilityProblems="false"

@@ -235,7 +255,7 @@
 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;_WIN64"

+				PreprocessorDefinitions="_DEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;BOOST_ALL_DYN_LINK;_WIN64"

 				Culture="1033"

 				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"

 			/>

@@ -243,8 +263,17 @@
 				Name="VCPreLinkEventTool"

 			/>

 			<Tool

-				Name="VCLibrarianTool"

-				OutputFile=".\qmfconsolesd.lib"

+				Name="VCLinkerTool"

+				AdditionalOptions="/machine:AMD64"

+				AdditionalDependencies="qpidcommond.lib qpidclientd.lib"

+				OutputFile="$(OutDir)\qmfconsoled.dll"

+				LinkIncremental="2"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories=".;$(BOOST_ROOT)\lib"

+				GenerateDebugInformation="true"

+				SubSystem="2"

+				ImportLibrary=".\qmfconsoled.lib"

+				TargetMachine="17"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -260,13 +289,14 @@
 			/>

 			<Tool

 				Name="VCPostBuildEventTool"

+				CommandLine="@if not exist deploy\include\qpid\console mkdir deploy\include\qpid\console&#x0D;&#x0A;@if not exist deploy\lib mkdir deploy\lib&#x0D;&#x0A;&#x0D;&#x0A;@copy /Y qpid\console\*.h deploy\include\qpid\console\&#x0D;&#x0A;&#x0D;&#x0A;@copy /Y $(OutDir)\qmfconsoled.dll deploy\lib\&#x0D;&#x0A;@copy /Y .\qmfconsoled.lib deploy\lib\&#x0D;&#x0A;"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Release|x64"

 			OutputDirectory="."

-			IntermediateDirectory="Static_Release\qmfconsole\AMD64"

-			ConfigurationType="4"

+			IntermediateDirectory="Release\qmfconsole\AMD64"

+			ConfigurationType="2"

 			CharacterSet="0"

 

 			>

@@ -295,8 +325,8 @@
 				Name="VCCLCompilerTool"

 				Optimization="2"

 				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"

-                                PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;NOMINMAX;WIN32_LEAN_AND_MEAN"

-				RuntimeLibrary="0"

+                                PreprocessorDefinitions="CONSOLE_EXPORT;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;NOMINMAX;WIN32_LEAN_AND_MEAN;BOOST_ALL_DYN_LINK"

+				RuntimeLibrary="2"

 				RuntimeTypeInfo="true"

 				WarningLevel="3"

 				Detect64BitPortabilityProblems="false"

@@ -307,7 +337,7 @@
 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;_WIN64"

+				PreprocessorDefinitions="NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;BOOST_ALL_DYN_LINK;_WIN64"

 				Culture="1033"

 				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"

 			/>

@@ -315,8 +345,19 @@
 				Name="VCPreLinkEventTool"

 			/>

 			<Tool

-				Name="VCLibrarianTool"

-				OutputFile=".\qmfconsoles.lib"

+				Name="VCLinkerTool"

+				AdditionalOptions="/machine:AMD64"

+				AdditionalDependencies="qpidcommon.lib qpidclient.lib"

+				OutputFile="$(OutDir)\qmfconsole.dll"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories=".;$(BOOST_ROOT)\lib"

+				GenerateDebugInformation="true"

+				SubSystem="2"

+				OptimizeReferences="2"

+				EnableCOMDATFolding="2"

+				ImportLibrary=".\qmfconsole.lib"

+				TargetMachine="17"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -332,6 +373,7 @@
 			/>

 			<Tool

 				Name="VCPostBuildEventTool"

+				CommandLine="@if not exist deploy\include\qpid\console mkdir deploy\include\qpid\console&#x0D;&#x0A;@if not exist deploy\lib mkdir deploy\lib&#x0D;&#x0A;&#x0D;&#x0A;@copy /Y qpid\console\*.h deploy\include\qpid\console\&#x0D;&#x0A;&#x0D;&#x0A;@copy /Y $(OutDir)\qmfconsole.dll deploy\lib\&#x0D;&#x0A;@copy /Y .\qmfconsole.lib deploy\lib\&#x0D;&#x0A;"

 			/>

 		</Configuration>

 	</Configurations>