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

Change the QT toolset to use new standalone project feature.

Browse Source 
[SVN r18545]
This commit is contained in:
Vladimir Prus
2003-05-26 14:44:24 +00:00
parent fd6016b3cd
commit c0522c6ea0
4 changed files with 52 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
new/builtin.jam
View File

@@ -66,6 +66,12 @@ feature location : : free path ;
feature dll-path : : free path ;
feature hardcode-dll-paths : false true : incidental propagated ;
# This feature is used to allow specific generators to run.
# For example, QT tools can only be invoked when QT library
# is used. In that case, <allow>qt will be in usage requirement
# of the library.
feature allow : : free ;
# Windows-specific features

37
new/qt.jam
View File

@@ -9,6 +9,13 @@ import errors ;
import type ;
import class : class new ;
import generators ;
import project ;
# Convert this module into a project, so that we can declare
# targets here.
project.initialize $(__name__) ;
project qt ;
# Initialized the QT support module. The 'prefix' parameter
# tells where QT is installed. When not given, environmental
@@ -39,14 +46,14 @@ rule init ( prefix ? )
.prefix = $(prefix) ;
feature.extend uses : qt ;
feature.action <uses>qt : add-properties ;
#feature.action <uses>qt : add-properties ;
generators.register-standard qt.moc : H : CPP(moc_%) : <uses>qt ;
generators.register-standard qt.moc : H : CPP(moc_%) : <allow>qt ;
type.register UI : ui ;
type.register UIC_H : : H ;
generators.register-standard qt.uic-h : UI : UIC_H : <uses>qt ;
generators.register-standard qt.uic-h : UI : UIC_H : <allow>qt ;
# The following generator is used to convert UI files to CPP
# It creates UIC_H from UI, and constructs CPP from UI/UIC_H
@@ -75,23 +82,19 @@ rule init ( prefix ? )
class qt.uic-cpp-generator : generator ;
generators.register [ new qt.uic-cpp-generator ] ;
# Finally, declare prebuilt target for QT library.
local usage-requirements =
<include>$(.prefix)/include
<dll-path>$(.prefix)/lib
<library-path>$(.prefix)/lib
<allow>qt
;
lib qt : : <name>qt-mt <threading>multi : : $(usage-requirements) ;
lib qt : : <name>qt <threading>single : : $(usage-requirements) ;
}
}
rule add-properties ( property : properties * )
{
local lib-name ;
if <threading>multi in $(properties)
{
lib-name = qt-mt ;
}
else
{
lib-name = qt ;
}
return <include>$(.prefix)/include <dll-path>$(.prefix)/lib <library-path>$(.prefix)/lib <find-shared-library>$(lib-name) ;
}
# -f forces moc to include the processed source file.
# Without it, it would think that .qpp is not a header and would not
# include it from the generated file.

37
v2/qt.jam
View File

@@ -9,6 +9,13 @@ import errors ;
import type ;
import class : class new ;
import generators ;
import project ;
# Convert this module into a project, so that we can declare
# targets here.
project.initialize $(__name__) ;
project qt ;
# Initialized the QT support module. The 'prefix' parameter
# tells where QT is installed. When not given, environmental
@@ -39,14 +46,14 @@ rule init ( prefix ? )
.prefix = $(prefix) ;
feature.extend uses : qt ;
feature.action <uses>qt : add-properties ;
#feature.action <uses>qt : add-properties ;
generators.register-standard qt.moc : H : CPP(moc_%) : <uses>qt ;
generators.register-standard qt.moc : H : CPP(moc_%) : <allow>qt ;
type.register UI : ui ;
type.register UIC_H : : H ;
generators.register-standard qt.uic-h : UI : UIC_H : <uses>qt ;
generators.register-standard qt.uic-h : UI : UIC_H : <allow>qt ;
# The following generator is used to convert UI files to CPP
# It creates UIC_H from UI, and constructs CPP from UI/UIC_H
@@ -75,23 +82,19 @@ rule init ( prefix ? )
class qt.uic-cpp-generator : generator ;
generators.register [ new qt.uic-cpp-generator ] ;
# Finally, declare prebuilt target for QT library.
local usage-requirements =
<include>$(.prefix)/include
<dll-path>$(.prefix)/lib
<library-path>$(.prefix)/lib
<allow>qt
;
lib qt : : <name>qt-mt <threading>multi : : $(usage-requirements) ;
lib qt : : <name>qt <threading>single : : $(usage-requirements) ;
}
}
rule add-properties ( property : properties * )
{
local lib-name ;
if <threading>multi in $(properties)
{
lib-name = qt-mt ;
}
else
{
lib-name = qt ;
}
return <include>$(.prefix)/include <dll-path>$(.prefix)/lib <library-path>$(.prefix)/lib <find-shared-library>$(lib-name) ;
}
# -f forces moc to include the processed source file.
# Without it, it would think that .qpp is not a header and would not
# include it from the generated file.

6
v2/tools/builtin.jam
View File

@@ -66,6 +66,12 @@ feature location : : free path ;
feature dll-path : : free path ;
feature hardcode-dll-paths : false true : incidental propagated ;
# This feature is used to allow specific generators to run.
# For example, QT tools can only be invoked when QT library
# is used. In that case, <allow>qt will be in usage requirement
# of the library.
feature allow : : free ;
# Windows-specific features