diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2012-04-02 18:53:27 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2012-04-02 18:53:27 +0000 |
| commit | 4f4a28de3f2a5a144825cadcb7deed6b849fba6d (patch) | |
| tree | 079fc3441b0f9a401535338ee89a21b04f80d696 /cpp | |
| parent | 2ed18fbce9793b3207de3e30ffeac60cf6055a93 (diff) | |
| download | qpid-python-4f4a28de3f2a5a144825cadcb7deed6b849fba6d.tar.gz | |
NO-JIRA: Allow Cmake builds to carry on working on Fedora (and probably other Unixes):
The QPID_LINK_BOOST_DYNAMIC option needs to be created for non MSVC builds too now
that we only conditionally link the tests dynamically as Unix bulds are always dynamic.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1308461 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/CMakeLists.txt b/cpp/src/CMakeLists.txt index b6ce249708..f6d01eaf9c 100644 --- a/cpp/src/CMakeLists.txt +++ b/cpp/src/CMakeLists.txt @@ -354,6 +354,7 @@ endif (NOT Boost_REGEX_LIBRARY) # Boost on Windows can use automatic linking to pick up the correct # Boost libs based on compile-time touching of the headers. Since we don't # really need to add them to the link lines, set the names to blanks. +option(QPID_LINK_BOOST_DYNAMIC "Link with dynamic Boost libs (OFF to link static)" ON) if (MSVC) install (PROGRAMS ${Boost_DATE_TIME_LIBRARY_DEBUG} ${Boost_DATE_TIME_LIBRARY_RELEASE} @@ -371,7 +372,6 @@ if (MSVC) COMPONENT ${QPID_COMPONENT_COMMON}) endif (NOT Boost_VERSION LESS 103500) - option(QPID_LINK_BOOST_DYNAMIC "Link with dynamic Boost libs (OFF to link static)" ON) if (QPID_LINK_BOOST_DYNAMIC) add_definitions( /D BOOST_ALL_DYN_LINK) string (REPLACE .lib .dll |