summaryrefslogtreecommitdiff
path: root/qpid/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'qpid/cpp')
-rw-r--r--qpid/cpp/CMakeLists.txt3
-rw-r--r--qpid/cpp/src/CMakeLists.txt3
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)