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

From: juergen.hunold_at_[hidden]
Date: 2008-05-22 15:06:33

Author: jhunold
Date: 2008-05-22 15:06:32 EDT (Thu, 22 May 2008)
New Revision: 45664
URL: http://svn.boost.org/trac/boost/changeset/45664

Log:
Make all libraries "explicit". Workaround for missing "configure" support.

Text files modified: 
   trunk/tools/build/v2/tools/qt4.jam |    12 ++++++++++--                            
   1 files changed, 10 insertions(+), 2 deletions(-)

Modified: trunk/tools/build/v2/tools/qt4.jam
==============================================================================
--- trunk/tools/build/v2/tools/qt4.jam	(original)
+++ trunk/tools/build/v2/tools/qt4.jam	2008-05-22 15:06:32 EDT (Thu, 22 May 2008)
@@ -160,11 +160,13 @@
 
         # dependency scanner for wrapped files.
         type.set-scanner QRC : qrc-scanner ;
+        
+        # List of all Qt libraries
+        local all-libraries = QtCore QtGui QtNetwork QtXml QtSql QtSvg QtOpenGL Qt3Support QtTest QtAssistantClient QtDesigner QtUiTools QtDBus QtScript QtHelp QtXmlPatterns QtWebKit phonon ;
 
         # Test for a buildable Qt.
         if [ glob $(.prefix)/Jamroot ]
         {
-            local all-libraries = QtCore QtGui QtNetwork QtXml QtSql QtSvg QtOpenGL Qt3Support QtTest QtAssistantClient QtDesigner QtUiTools QtDBus QtScript QtHelp QtXmlPatterns QtWebKit phonon ;
             # Import all Qt Modules
             for local l in $(all-libraries)
             {
@@ -173,7 +175,6 @@
                     :
                     :
                     : <allow>qt4 ;
-                explicit $(l) ;
             }
         }
         else
@@ -562,6 +563,13 @@
                   <include>$(.incprefix)/QtAssistant 
                 ;
        }
+
+       # Make library names explicit so that a simple <use>qt4 will not bring in everything.
+       # And some components like QtDBus/Phonon may not be available on some platforms.
+       for local l in $(all-libraries)
+       {
+           explicit $(l) ;
+       }
     }
 
     project.pop-current ;