diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2014-06-18 19:57:29 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2014-06-18 19:57:29 +0000 |
| commit | 2622dda9c7d3267efd985b5ae5928b99063d2fa7 (patch) | |
| tree | 22b4860ca12cbcb5bbb76e14d432008877f38729 | |
| parent | 8661b1bb4bc5b31df06ff73581c47acf2a4e62b4 (diff) | |
| download | qpid-python-2622dda9c7d3267efd985b5ae5928b99063d2fa7.tar.gz | |
QPID-5829: One more CMake rearrangement and all will be good...
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1603613 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/cpp/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/qpid/cpp/CMakeLists.txt b/qpid/cpp/CMakeLists.txt index 7fdbb4e09e..45803aae73 100644 --- a/qpid/cpp/CMakeLists.txt +++ b/qpid/cpp/CMakeLists.txt @@ -51,6 +51,9 @@ include(BuildInstallSettings.cmake) enable_testing() include (CTest) +# Define windows versions and library helpers +include (src/msvc.cmake) + if (MSVC) # Change warning C4996 from level 1 to level 4. These are real and shouldn't # be completely ignored, but they're pretty well checked out and will throw @@ -198,9 +201,6 @@ 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 |