diff options
| author | Charles E. Rolke <chug@apache.org> | 2013-11-04 16:52:58 +0000 |
|---|---|---|
| committer | Charles E. Rolke <chug@apache.org> | 2013-11-04 16:52:58 +0000 |
| commit | d0dc0761c8e2fb1a44f1c6c149fa800b5a2fe2c6 (patch) | |
| tree | 4dbfc8dfe16318963d70dccf014686c9a5f6b291 /qpid/cpp/src | |
| parent | 2bcd7e8519c7b7e81017df68a0f54dd06ce72c8d (diff) | |
| download | qpid-python-d0dc0761c8e2fb1a44f1c6c149fa800b5a2fe2c6.tar.gz | |
QPID-5287: .NET binding does not set AssemblyVersion to build version.
The fix is
1. rename the AssemblyInfo.cpp to indicate that it is a template.
2. put replacement strings into the template (see sessionreceiver for correct pattern).
3. configure the template during cmake run.
4. Refer to generated file in projects that need it.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1538674 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
| -rw-r--r-- | qpid/cpp/src/CMakeLists.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/qpid/cpp/src/CMakeLists.txt b/qpid/cpp/src/CMakeLists.txt index 19e70eb549..1da108b727 100644 --- a/qpid/cpp/src/CMakeLists.txt +++ b/qpid/cpp/src/CMakeLists.txt @@ -230,6 +230,8 @@ if (MSVC) # 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) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../bindings/qpid/dotnet/src/AssemblyInfo-template.cpp + ${CMAKE_CURRENT_BINARY_DIR}/windows/generated_src/AssemblyInfo.cpp) # 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) |