qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject svn commit: r1603587 - in /qpid/trunk/qpid/cpp: CMakeLists.txt src/CMakeLists.txt
Date Wed, 18 Jun 2014 19:10:19 GMT
Author: chug
Date: Wed Jun 18 19:10:19 2014
New Revision: 1603587

URL: http://svn.apache.org/r1603587
Log:
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.

Modified:
    qpid/trunk/qpid/cpp/CMakeLists.txt
    qpid/trunk/qpid/cpp/src/CMakeLists.txt

Modified: qpid/trunk/qpid/cpp/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/CMakeLists.txt?rev=1603587&r1=1603586&r2=1603587&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/CMakeLists.txt Wed Jun 18 19:10:19 2014
@@ -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

Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/CMakeLists.txt?rev=1603587&r1=1603586&r2=1603587&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/CMakeLists.txt Wed Jun 18 19:10:19 2014
@@ -63,9 +63,6 @@ find_package_handle_standard_args(SASL D
 
 #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)



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message