summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorCharles E. Rolke <chug@apache.org>2010-10-11 14:46:38 +0000
committerCharles E. Rolke <chug@apache.org>2010-10-11 14:46:38 +0000
commitaf7a3bddc518fa705d730e6cafbce614f5df562d (patch)
tree2328b42430adc9123868c04e082eafc66189d439 /cpp/src
parent0cb8fdbd743438ac13efbe89121e05b15a473600 (diff)
downloadqpid-python-af7a3bddc518fa705d730e6cafbce614f5df562d.tar.gz
QPID-2863 Propagate WinSDK Build Version numbers to the Messaging .NET Binding
Rooted at qpid/, this patch propagates the Windows version numbers to the .NET Binding DLLs. The changes can be summarized: 1. The files that hold the version numbers are renamed to templates and are edited to hold the version number CMake variable names. 2. CMake calls configure_file twice to put the version numbers into the generated files. 3. The projects that use these files are steered to use the generated source. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1021361 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/CMakeLists.txt11
1 files changed, 10 insertions, 1 deletions
diff --git a/cpp/src/CMakeLists.txt b/cpp/src/CMakeLists.txt
index 2be11a7478..e52ccb6777 100644
--- a/cpp/src/CMakeLists.txt
+++ b/cpp/src/CMakeLists.txt
@@ -589,9 +589,18 @@ if (CMAKE_SYSTEM_NAME STREQUAL Windows)
add_definitions(/D "_WIN32_WINNT=0x0501")
endif (MSVC80)
- # set the RelWithDebInfo compile/link switchs to equal Release
+ # set the RelWithDebInfo compile/link switches to equal Release
set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MD /O2 /Ob2 /D NDEBUG")
set (CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "/debug /INCREMENTAL:NO")
+
+ # Set the windows version for the .NET Binding cpp project
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../bindings/qpid/dotnet/src/org.apache.qpid.messaging.template.rc
+ ${CMAKE_CURRENT_BINARY_DIR}/windows/resources/org.apache.qpid.messaging.rc)
+
+ # Set the windows version for the .NET Binding sessionreceiver project
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../bindings/qpid/dotnet/src/sessionreceiver/properties/sessionreceiver-AssemblyInfo-template.cs
+ ${CMAKE_CURRENT_BINARY_DIR}/windows/generated_src/sessionreceiver-AssemblyInfo.cs)
+
endif (MSVC)
set (qpidtypes_platform_SOURCES