diff options
| author | Stephen D. Huston <shuston@apache.org> | 2009-12-14 20:47:24 +0000 |
|---|---|---|
| committer | Stephen D. Huston <shuston@apache.org> | 2009-12-14 20:47:24 +0000 |
| commit | 17b9b12ce83f26f70cb609927dc3e1bb9375302b (patch) | |
| tree | 34b4fd154eb0f5f2b215fb1cd28e8b9af9aa2272 | |
| parent | 0276bdc61b37b8818525a1a91da498e5f98dcd5f (diff) | |
| download | qpid-python-17b9b12ce83f26f70cb609927dc3e1bb9375302b.tar.gz | |
Don't explicitly name Boost libs in Windows link; fixes QPID-2271
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@890473 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/cpp/examples/CMakeLists.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/qpid/cpp/examples/CMakeLists.txt b/qpid/cpp/examples/CMakeLists.txt index 759a9f2020..de74d9cf39 100644 --- a/qpid/cpp/examples/CMakeLists.txt +++ b/qpid/cpp/examples/CMakeLists.txt @@ -28,6 +28,9 @@ include_directories(${CMAKE_SOURCE_DIR}/include) # 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 @@ link_directories( ${Boost_LIBRARY_DIRS} ) # 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 |