[Boost-commit] svn:boost r78801 - trunk/tools/build/v2/tools

Subject: [Boost-commit] svn:boost r78801 - trunk/tools/build/v2/tools
From: juergen.hunold_at_[hidden]
Date: 2012-06-03 11:13:06

Author: jhunold
Date: 2012-06-03 11:13:05 EDT (Sun, 03 Jun 2012)
New Revision: 78801
URL: http://svn.boost.org/trac/boost/changeset/78801

Log:
Fix: correct library names of static Qt on Windows.

Static Qt libraries do not have the "4" suffix.
And it is not necessary to enhance the dll path when using static libraries.
Text files modified: 
   trunk/tools/build/v2/tools/qt4.jam |    15 ++++++++++++---                         
   1 files changed, 12 insertions(+), 3 deletions(-)

Modified: trunk/tools/build/v2/tools/qt4.jam
==============================================================================
--- trunk/tools/build/v2/tools/qt4.jam	(original)
+++ trunk/tools/build/v2/tools/qt4.jam	2012-06-03 11:13:05 EDT (Sun, 03 Jun 2012)
@@ -297,13 +297,19 @@
    # Setup common pre-built Qt.
    # Special setup for QtCore on which everything depends
    {
+       local link = [ feature.get-values link : $(condition) ] ;
+
        local usage-requirements =
            <include>$(.incprefix)
            <library-path>$(.libprefix)
-           <dll-path>$(.libprefix)
            <threading>multi
            <allow>qt4 ;
 
+       if $(link) in shared
+       {
+           usage-requirements += <dll-path>$(.libprefix) ;
+       }
+
        local suffix ;
 
        # Since Qt-4.2, debug versions on unix have to be built
@@ -323,8 +329,11 @@
        {
            .have_separate_debug = TRUE ;
 
-           # On NT, the libs have "4" suffix, and "d" suffix in debug builds.
-           .suffix_version = "4" ;
+           # On NT, the shared libs have "4" suffix, and "d" suffix in debug builds.
+           if $(link) in shared
+           {
+                .suffix_version = "4" ;
+           }
            .suffix_debug = "d" ;
 
            # On Windows we must link against the qtmain library