boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-12 12:02:24 +00:00
Code Issues Projects Releases Wiki Activity

Upgrade to Qt-4.2:

Browse Source 
- Add support for QtDBus library.
- Adjust to changes in Qt's build system: No parallel build of debug and release libraries on Unix anymore.
- Remove explicit "<variant>release" requirements for release builds, enabling custom build variants.


[SVN r35809]
This commit is contained in:
Jürgen Hunold
2006-11-02 15:15:07 +00:00
parent d652aa9fab
commit d6c1bd7dfd
1 changed files with 119 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

172
src/tools/qt4.jam
View File

@@ -114,7 +114,7 @@ rule init ( prefix )
if [ glob $(.prefix)/Jamroot ]
{
# Import all Qt Modules
local all-libraries = QtCore QtGui QtNetwork QtXml QtSql QtSvg QtOpenGL Qt3Support QtTest QtAssistantClient QtDesigner QtUiTools ;
local all-libraries = QtCore QtGui QtNetwork QtXml QtSql QtSvg QtOpenGL Qt3Support QtTest QtAssistantClient QtDesigner QtUiTools QtDBus ;
for local l in $(all-libraries)
{
alias $(l)
@@ -144,20 +144,32 @@ rule init ( prefix )
# Also, on NT we must link against qtmain library (for WinMain)
suffix_version = "4" ;
suffix_debug = "d" ;
lib qtmain : : <name>qtmain$(suffix_debug) <variant>debug ;
lib qtmain : : <name>qtmain <variant>release ;
lib qtmain
: # sources
: # requirements
<name>qtmain$(suffix_debug)
<variant>debug
;
lib qtmain
: # sources
: # requirements
<name>qtmain
;
main = qtmain ;
}
else
{
# On X11, debug versions of libs have "_debug" suffix
# Since Qt-4.2, debug versions on unix have to be built separately
# and therefore have no suffix.
suffix_version = "" ;
suffix_debug = "_debug" ;
suffix_debug = "" ;
}
lib QtCore : $(main)
: <name>QtCore$(suffix_version) <variant>release
:
: # requirements
<name>QtCore$(suffix_version)
: # default-build
: # usage-requirements
<define>QT_CORE_LIB
<define>QT_NO_DEBUG
@@ -165,8 +177,10 @@ rule init ( prefix )
$(usage-requirements)
;
lib QtCore : $(main)
: <name>QtCore$(suffix_debug)$(suffix_version) <variant>debug
:
: # requirements
<name>QtCore$(suffix_debug)$(suffix_version)
<variant>debug
: # default-build
: # usage-requirements
<define>QT_CORE_LIB
<include>$(.prefix)/include/QtCore
@@ -174,8 +188,9 @@ rule init ( prefix )
;
lib QtGui : QtCore
: <name>QtGui$(suffix_version) <variant>release
:
: # requirements
<name>QtGui$(suffix_version)
: # default-build
: # usage-requirements
<define>QT_GUI_LIB
<include>$(.prefix)/include/QtGui
@@ -183,8 +198,10 @@ rule init ( prefix )
;
lib QtGui : QtCore
: <name>QtGui$(suffix_debug)$(suffix_version) <variant>debug
:
: # requirements
<name>QtGui$(suffix_debug)$(suffix_version)
<variant>debug
: # default-build
: # usage-requirements
<define>QT_GUI_LIB
<include>$(.prefix)/include/QtGui
@@ -192,53 +209,64 @@ rule init ( prefix )
;
lib QtNetwork : QtCore
: <name>QtNetwork$(suffix_version) <variant>release
:
: # requirements
<name>QtNetwork$(suffix_version)
: # default-build
: # usage-requirements
<define>QT_NETWORK_LIB
<include>$(.prefix)/include/QtNetwork
;
lib QtNetwork : QtCore
: <name>QtNetwork$(suffix_debug)$(suffix_version) <variant>debug
:
: # requirements
<name>QtNetwork$(suffix_debug)$(suffix_version)
<variant>debug
: # default-build
: # usage-requirements
<define>QT_NETWORK_LIB
<include>$(.prefix)/include/QtNetwork
;
lib QtSql : QtCore
: <name>QtSql$(suffix_version) <variant>release
:
: # requirements
<name>QtSql$(suffix_version)
: # default-build
: # usage-requirements
<define>QT_SQL_LIB
<include>$(.prefix)/include/QtSql
;
lib QtSql : QtCore
: <name>QtSql$(suffix_debug)$(suffix_version) <variant>debug
:
: # requirements
<name>QtSql$(suffix_debug)$(suffix_version)
<variant>debug
: # default-build
: # usage-requirements
<define>QT_SQL_LIB
<include>$(.prefix)/include/QtSql
;
lib QtXml : QtCore
: <name>QtXml$(suffix_version) <variant>release
:
: # requirements
<name>QtXml$(suffix_version)
: # default-build
: # usage-requirements
<define>QT_XML_LIB
<include>$(.prefix)/include/QtXml
;
lib QtXml : QtCore
: <name>QtXml$(suffix_debug)$(suffix_version) <variant>debug
:
: # requirements
<name>QtXml$(suffix_debug)$(suffix_version)
<variant>debug
: # default-build
: # usage-requirements
<define>QT_XML_LIB
<include>$(.prefix)/include/QtXml
;
lib Qt3Support : QtGui QtNetwork QtXml QtSql
: <name>Qt3Support$(suffix_version) <variant>release <qt3support>on
:
: # requirements
<name>Qt3Support$(suffix_version)
<qt3support>on
: # default-build
: # usage-requirements
<define>QT_QT3SUPPORT_LIB
<define>QT3_SUPPORT
@@ -246,8 +274,11 @@ rule init ( prefix )
;
lib Qt3Support : QtGui QtNetwork QtXml QtSql
: <name>Qt3Support$(suffix_debug)$(suffix_version) <variant>debug <qt3support>on
:
: # requirements
<name>Qt3Support$(suffix_debug)$(suffix_version)
<qt3support>on
<variant>debug
: # default-build
: # usage-requirements
<define>QT_QT3SUPPORT_LIB
<define>QT3_SUPPORT
@@ -260,15 +291,18 @@ rule init ( prefix )
# OpenGl Support
lib QtOpenGL : QtGui
: <name>QtOpenGL$(suffix_version) <variant>release
:
: # requirements
<name>QtOpenGL$(suffix_version)
: # default-build
: # usage-requirements
<define>QT_OPENGL_LIB
<include>$(.prefix)/include/QtOpenGL
;
lib QtOpenGL : QtGui
: <name>QtOpenGL$(suffix_debug)$(suffix_version) <variant>debug
:
: # requirements
<name>QtOpenGL$(suffix_debug)$(suffix_version)
<variant>debug
: # default-build
: # usage-requirements
<define>QT_OPENGL_LIB
<include>$(.prefix)/include/QtOpenGL
@@ -276,15 +310,18 @@ rule init ( prefix )
# SVG-Support (Qt 4.1)
lib QtSvg : QtXml QtOpenGL
: <name>QtSvg$(suffix_version) <variant>release
:
: # requirements
<name>QtSvg$(suffix_version)
: # default-build
: # usage-requirements
<define>QT_SVG_LIB
<include>$(.prefix)/include/QtSvg
;
lib QtSvg : QtXml QtOpenGL
: <name>QtSvg$(suffix_debug)$(suffix_version) <variant>debug
:
: # requirements
<name>QtSvg$(suffix_debug)$(suffix_version)
<variant>debug
: # default-build
: # usage-requirements
<define>QT_SVG_LIB
<include>$(.prefix)/include/QtSvg
@@ -292,60 +329,89 @@ rule init ( prefix )
# Test-Support (Qt 4.1)
lib QtTest : QtCore
: <name>QtTest$(suffix_version) <variant>release
:
: # requirements
<name>QtTest$(suffix_version)
: # default-build
: # usage-requirements
<include>$(.prefix)/include/QtTest
;
lib QtTest : QtCore
: <name>QtTest$(suffix_debug)$(suffix_version) <variant>debug
:
: # requirements
<name>QtTest$(suffix_debug)$(suffix_version)
<variant>debug
: # default-build
: # usage-requirements
<include>$(.prefix)/include/QtTest
;
# AssistantClient Support
lib QtAssistantClient : QtGui
: <name>QtAssistantClient$(suffix_version) <variant>release
:
: # requirements
<name>QtAssistantClient$(suffix_version)
: # default-build
: # usage-requirements
<include>$(.prefix)/include/QtAssistant
;
lib QtAssistantClient : QtGui
: <name>QtAssistantClient$(suffix_debug)$(suffix_version) <variant>debug
:
: # requirements
<name>QtAssistantClient$(suffix_debug)$(suffix_version)
<variant>debug
: # default-build
: # usage-requirements
<include>$(.prefix)/include/QtAssistant
;
# Qt designer library
lib QtDesigner : QtGui QtXml
: <name>QtDesigner$(suffix_version) <variant>release
:
: # requirements
<name>QtDesigner$(suffix_version)
: # default-build
: # usage-requirements
<include>$(.prefix)/include/QtDesigner
;
lib QtDesigner : QtGui QtXml
: <name>QtDesigner$(suffix_debug)$(suffix_version) <variant>debug
:
: # requirements
<name>QtDesigner$(suffix_debug)$(suffix_version)
<variant>debug
: # default-build
: # usage-requirements
<include>$(.prefix)/include/QtDesigner
;
# Support for dynamic Widgets (Qt 4.1)
lib QtUiTools : QtGui QtXml
: <name>QtUiTools <variant>release
:
: # requirements
<name>QtUiTools
: # default-build
: # usage-requirements
<include>$(.prefix)/include/QtUiTools
;
lib QtUiTools : QtGui QtXml
: <name>QtUiTools$(suffix_debug) <variant>debug
:
: # requirements
<name>QtUiTools$(suffix_debug)
<variant>debug
: # default-build
: # usage-requirements
<include>$(.prefix)/include/QtUiTools
;
# DBus-Support (Qt 4.2)
lib QtDBus : QtXml
: # requirements
<name>QtDBus$(suffix_version)
: # default-build
: # usage-requirements
<include>$(.prefix)/include/QtDBus
;
lib QtDBus : QtXml
: # requirements
<name>QtDBus$(suffix_debug)$(suffix_version)
<variant>debug
: # default-build
: # usage-requirements
<include>$(.prefix)/include/QtDBus
;
}
}