summaryrefslogtreecommitdiff
path: root/qpid/cpp
diff options
context:
space:
mode:
authorAndrew Stitcher <astitcher@apache.org>2014-06-18 21:00:14 +0000
committerAndrew Stitcher <astitcher@apache.org>2014-06-18 21:00:14 +0000
commit3a95f8c316e8d81a876094409a5952b3f41b5ba3 (patch)
treebb76692327c83442e559d1fd95c80dc848770dec /qpid/cpp
parent81793b69c3e2678023ffb92ef2b3448adb4bdb53 (diff)
downloadqpid-python-3a95f8c316e8d81a876094409a5952b3f41b5ba3.tar.gz
QPID-5829: This rearrangement is really it...
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1603632 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp')
-rw-r--r--qpid/cpp/CMakeLists.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/qpid/cpp/CMakeLists.txt b/qpid/cpp/CMakeLists.txt
index 45803aae73..c5be4de97a 100644
--- a/qpid/cpp/CMakeLists.txt
+++ b/qpid/cpp/CMakeLists.txt
@@ -51,9 +51,6 @@ 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
@@ -119,6 +116,9 @@ configure_file(
add_custom_target(uninstall
COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
+# Define windows versions and library helpers
+include (src/msvc.cmake)
+
# Do not keep on linking against transitive library dependencies
# TODO Need to rework CMake files to use INTERFACE_LINK_LIBRARIES target property
# When that is done we can remove the next 4 lines completely