qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shus...@apache.org
Subject svn commit: r890473 - /qpid/trunk/qpid/cpp/examples/CMakeLists.txt
Date Mon, 14 Dec 2009 20:47:37 GMT
Author: shuston
Date: Mon Dec 14 20:47:24 2009
New Revision: 890473

URL: http://svn.apache.org/viewvc?rev=890473&view=rev
Log:
Don't explicitly name Boost libs in Windows link; fixes QPID-2271

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

Modified: qpid/trunk/qpid/cpp/examples/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/CMakeLists.txt?rev=890473&r1=890472&r2=890473&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/examples/CMakeLists.txt Mon Dec 14 20:47:24 2009
@@ -28,6 +28,9 @@
 # Shouldn't need this... but there are still client header inclusions
 # of Boost. When building examples at an install site, the Boost files
 # should be locatable aside from these settings.
+# So set up to find the headers, find the libs at link time, but dynamically
+# link them all and clear the CMake Boost library names to avoid adding them to
+# the project files.
 include_directories( ${Boost_INCLUDE_DIR} )
 link_directories( ${Boost_LIBRARY_DIRS} )
 
@@ -35,7 +38,9 @@
 # Linux needs to reference the boost libs, even though they should be
 # resolved via the Qpid libs.
 if (MSVC)
-  add_definitions( /D "NOMINMAX" /D "WIN32_LEAN_AND_MEAN" )
+  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



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


Mime
View raw message