qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shus...@apache.org
Subject svn commit: r890888 - in /qpid/trunk/qpid/cpp/examples: CMakeLists.txt messaging/CMakeLists.txt
Date Tue, 15 Dec 2009 17:07:13 GMT
Author: shuston
Date: Tue Dec 15 17:07:13 2009
New Revision: 890888

URL: http://svn.apache.org/viewvc?rev=890888&view=rev
Log:
The spout/drain examples have qpid::Options usage which inlines the boost::program_options
usage. This requires linking boost_program_options in the examples, not via qpidcommon. Adjust
the Windows options to handle this. Resolves QPID-2212.

Modified:
    qpid/trunk/qpid/cpp/examples/CMakeLists.txt
    qpid/trunk/qpid/cpp/examples/messaging/CMakeLists.txt

Modified: qpid/trunk/qpid/cpp/examples/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/CMakeLists.txt?rev=890888&r1=890887&r2=890888&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/examples/CMakeLists.txt Tue Dec 15 17:07:13 2009
@@ -39,13 +39,11 @@
 # resolved via the Qpid libs.
 if (MSVC)
   add_definitions( /D "NOMINMAX" /D "WIN32_LEAN_AND_MEAN" /D "BOOST_ALL_DYN_LINK" )
-  set(Boost_PROGRAM_OPTIONS_LIBRARY "")
-  set(Boost_FILESYSTEM_LIBRARY "")
   # On Windows, prevent the accidental inclusion of Boost headers from
   # autolinking in the Boost libs. There should be no direct references to
   # Boost in the examples, and references via qpidclient/qpidcommon are
   # resolved in the Qpid libs.
-  add_definitions( /D "BOOST_ALL_DYN_LINK" /D "BOOST_ALL_NO_LIB" )
+  add_definitions( /D "BOOST_ALL_NO_LIB" )
 else (MSVC)
   set(_boost_libs_needed ${Boost_PROGRAM_OPTIONS_LIBRARY}
                          ${Boost_FILESYSTEM_LIBRARY})

Modified: qpid/trunk/qpid/cpp/examples/messaging/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/messaging/CMakeLists.txt?rev=890888&r1=890887&r2=890888&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/messaging/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/examples/messaging/CMakeLists.txt Tue Dec 15 17:07:13 2009
@@ -17,12 +17,10 @@
 # under the License.
 #
 
-# disabling spout & drain on windows until build issues are resolved
-# (QPID-2212): 
-if (NOT MSVC)
-  add_example(messaging drain)
-  add_example(messaging spout)
-endif (NOT MSVC)
+# drain and spout have explicit Boost.program_options usage in them, so be
+# sure that lib is linked in.
+add_example(messaging drain ${Boost_PROGRAM_OPTIONS_LIBRARY})
+add_example(messaging spout ${Boost_PROGRAM_OPTIONS_LIBRARY})
 
 add_example(messaging queue_receiver)
 add_example(messaging queue_sender)



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org


Mime
View raw message