Added support for user settable BOOST_LIB_TOOLSET

[SVN r26428]
This commit is contained in:
John Maddock
2004-12-04 13:40:11 +00:00
parent dacd302d49
commit 3bad820e69
2 changed files with 15 additions and 1 deletions

View File

@@ -288,6 +288,17 @@ export LIBS=
off.</P> off.</P>
</TD> </TD>
</TR> </TR>
<TR>
<TD vAlign="top">BOOST_LIB_DIAGNOSTIC</TD>
<TD>Causes the auto-linking code to output diagnostic messages indicating the name
of the library that is selected for linking.</TD>
</TR>
<TR>
<TD vAlign="top">BOOST_LIB_TOOLSET</TD>
<TD>Overrides the name of the toolset part of the name of library being linked to;
note if defined this must be defined to a quoted string literal, for example
"abc".</TD>
</TR>
</table> </table>
<h4><a name="advanced_config"></a>Advanced configuration usage</h4> <h4><a name="advanced_config"></a>Advanced configuration usage</h4>
<p>By setting various macros on the compiler command line or by editing &lt;<a href="../../boost/config/user.hpp">boost/config/user.hpp</a>&gt;, <p>By setting various macros on the compiler command line or by editing &lt;<a href="../../boost/config/user.hpp">boost/config/user.hpp</a>&gt;,

View File

@@ -19,6 +19,7 @@ Before including this header you must define one or more of define the following
BOOST_LIB_NAME: Required: A string containing the basename of the library, BOOST_LIB_NAME: Required: A string containing the basename of the library,
for example boost_regex. for example boost_regex.
BOOST_LIB_TOOLSET: Optional: the base name of the toolset.
BOOST_DYN_LINK: Optional: when set link to dll rather than static library. BOOST_DYN_LINK: Optional: when set link to dll rather than static library.
BOOST_LIB_DIAGNOSTIC: Optional: when set the header will print out the name BOOST_LIB_DIAGNOSTIC: Optional: when set the header will print out the name
of the library selected (useful for debugging). of the library selected (useful for debugging).
@@ -103,8 +104,9 @@ BOOST_LIB_VERSION: The Boost version, in the form x_y, for Boost version x.y.
# error "Incompatible build options" # error "Incompatible build options"
#endif #endif
// //
// select toolset: // select toolset if not defined already:
// //
#ifndef BOOST_LIB_TOOLSET
#if defined(BOOST_MSVC) && (BOOST_MSVC == 1200) #if defined(BOOST_MSVC) && (BOOST_MSVC == 1200)
// vc6: // vc6:
@@ -146,6 +148,7 @@ BOOST_LIB_VERSION: The Boost version, in the form x_y, for Boost version x.y.
# define BOOST_LIB_TOOLSET "cw9" # define BOOST_LIB_TOOLSET "cw9"
#endif #endif
#endif // BOOST_LIB_TOOLSET
// //
// select thread opt: // select thread opt: