Author: astitcher
Date: Mon Apr 2 18:53:27 2012
New Revision: 1308461
URL: http://svn.apache.org/viewvc?rev=1308461&view=rev
Log:
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.
Modified:
qpid/trunk/qpid/cpp/src/CMakeLists.txt
Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/CMakeLists.txt?rev=1308461&r1=1308460&r2=1308461&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/CMakeLists.txt Mon Apr 2 18:53:27 2012
@@ -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
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
