Author: astitcher
Date: Wed Jun 18 19:57:29 2014
New Revision: 1603613
URL: http://svn.apache.org/r1603613
Log:
QPID-5829: One more CMake rearrangement and all will be good...
Modified:
qpid/trunk/qpid/cpp/CMakeLists.txt
Modified: qpid/trunk/qpid/cpp/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/CMakeLists.txt?rev=1603613&r1=1603612&r2=1603613&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/CMakeLists.txt Wed Jun 18 19:57:29 2014
@@ -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
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
