diff options
| author | Charles E. Rolke <chug@apache.org> | 2014-06-18 19:10:19 +0000 |
|---|---|---|
| committer | Charles E. Rolke <chug@apache.org> | 2014-06-18 19:10:19 +0000 |
| commit | 8661b1bb4bc5b31df06ff73581c47acf2a4e62b4 (patch) | |
| tree | 03b643bc40101d1258035a5f4bdcdf7a6003e7b4 /qpid/cpp | |
| parent | aaa0d24c1675428a91f8f622e4ea84b730443f35 (diff) | |
| download | qpid-python-8661b1bb4bc5b31df06ff73581c47acf2a4e62b4.tar.gz | |
QPID-5829: Rearrange CMake - repair original commit that breaks the .NET binding
r1603064 fails to define some CMake version variables before using them for template processing.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1603587 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp')
| -rw-r--r-- | qpid/cpp/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | qpid/cpp/src/CMakeLists.txt | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/qpid/cpp/CMakeLists.txt b/qpid/cpp/CMakeLists.txt index 41cfdeb260..7fdbb4e09e 100644 --- a/qpid/cpp/CMakeLists.txt +++ b/qpid/cpp/CMakeLists.txt @@ -198,6 +198,9 @@ if (MSVC) set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MD /O2 /Ob2 /D NDEBUG") set (CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "/debug /INCREMENTAL:NO") + # Define windows versions and library helpers + include (src/msvc.cmake) + if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/bindings/qpid/dotnet/src) # 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 diff --git a/qpid/cpp/src/CMakeLists.txt b/qpid/cpp/src/CMakeLists.txt index 7325e86f92..783b26cc5e 100644 --- a/qpid/cpp/src/CMakeLists.txt +++ b/qpid/cpp/src/CMakeLists.txt @@ -63,9 +63,6 @@ find_package_handle_standard_args(SASL DEFAULT_MSG FOUND_SASL_LIB FOUND_SASL_H) #set (CMAKE_VERBOSE_MAKEFILE ON) # for debugging -# Define windows versions and library helpers -include (msvc.cmake) - # Add a test to check the exported library API against expected API symbols MACRO (add_api_test libname) if (NOT CMAKE_SYSTEM_NAME STREQUAL Windows AND BUILD_TESTING) |