Add support for precompiled headers on MSVC.
Patch mostly from Reece H. Dunn Hacks in target.jam by myself. [SVN r31928]
This commit is contained in:
Vladimir Prus
parent
e8b3e6c725
commit
7247b1f143
@ -1108,7 +1108,7 @@ class basic-target : abstract-target
|
||||
if [ modules.peek : .debug-building ]
|
||||
{
|
||||
ECHO [ targets.indent ]
|
||||
"Usage requirements for $(self.name) are $(usage-requirements)" ;
|
||||
"Usage requirements for $(self.name) are " $(usage-requirements) ;
|
||||
}
|
||||
|
||||
rproperties = [ property-set.create $(properties)
|
||||
@ -1138,6 +1138,14 @@ class basic-target : abstract-target
|
||||
local ur = [ compute-usage-requirements $(s) ] ;
|
||||
ur = [ $(ur).add $(gur) ] ;
|
||||
$(s).set-usage-requirements $(ur) ;
|
||||
if [ modules.peek : .debug-building ]
|
||||
{
|
||||
ECHO [ targets.indent ]
|
||||
"Usage requirements from $(self.name) are "
|
||||
[ $(ur).raw ] ;
|
||||
}
|
||||
|
||||
|
||||
self.generated.$(property-set) = $(ur) $(result) ;
|
||||
}
|
||||
else
|
||||
@ -1176,8 +1184,28 @@ class basic-target : abstract-target
|
||||
local result = [ property-set.create
|
||||
[ $(xusage-requirements).non-dependency ] $(extra) ] ;
|
||||
|
||||
result = [ $(result).add
|
||||
[ $(subvariant).sources-usage-requirements ] ] ;
|
||||
# Propagate usage requirements we've got from sources, except
|
||||
# for the <pch-header> and <pch-file> features.
|
||||
#
|
||||
# That feature specifies which pch file to use, and should apply
|
||||
# only to direct dependents. Consider:
|
||||
#
|
||||
# pch pch1 : ...
|
||||
# lib lib1 : ..... pch1 ;
|
||||
# pch pch2 :
|
||||
# lib lib2 : pch2 lib1 ;
|
||||
#
|
||||
# Here, lib2 should not get <pch-header> property from pch1.
|
||||
#
|
||||
# Essentially, when those two features are in usage requirements,
|
||||
# they are propagated only to direct dependents. We might need
|
||||
# a more general mechanism, but for now, only those two
|
||||
# features are special.
|
||||
local raw = [ $(subvariant).sources-usage-requirements ] ;
|
||||
raw = [ $(raw).raw ] ;
|
||||
raw = [ property.change $(raw) : <pch-header> ] ;
|
||||
raw = [ property.change $(raw) : <pch-file> ] ;
|
||||
result = [ $(result).add [ property-set.create $(raw) ] ] ;
|
||||
|
||||
return $(result) ;
|
||||
}
|
||||
|
||||
@ -20,6 +20,7 @@ import "class" : new ;
|
||||
import rc ;
|
||||
import midl ;
|
||||
import mc ;
|
||||
import pch ;
|
||||
|
||||
if [ MATCH (--debug-configuration) : [ modules.peek : ARGV ] ]
|
||||
{
|
||||
@ -509,6 +510,8 @@ generators.override msvc.compile.idl : midl.compile.idl ;
|
||||
generators.register-standard msvc.compile.mc : MC : H RC : <toolset>msvc ;
|
||||
generators.override msvc.compile.mc : mc.compile ;
|
||||
|
||||
generators.register [ new pch-generator msvc.compile.pch : PCHEADER : OBJ PCH : <toolset>msvc ] ;
|
||||
|
||||
#
|
||||
# Declare flags and action for compilation
|
||||
#
|
||||
@ -559,17 +562,45 @@ flags msvc.compile DEFINES <define> ;
|
||||
flags msvc.compile UNDEFS <undef> ;
|
||||
flags msvc.compile INCLUDES <include> ;
|
||||
|
||||
# The actions differ only by explicit selection of input language
|
||||
actions compile.c
|
||||
flags msvc.compile PCH_SOURCE <pch-source> ;
|
||||
flags msvc.compile PCH_HEADER <pch>on : <pch-header> ;
|
||||
flags msvc.compile PCH_FILE <pch>on : <pch-file> ;
|
||||
|
||||
rule compile.c ( targets + : sources * : properties * )
|
||||
{
|
||||
$(.CC) /Zm800 -nologo -TC -U$(UNDEFS) $(CFLAGS) $(USER_CFLAGS) @"@($(<[1]:W).rsp:E=$(nl)"$(>)" $(nl)-D$(DEFINES) $(nl)"-I$(INCLUDES)")" -c -Fo"$(<[1]:W)"
|
||||
DEPENDS $(<) : [ on $(<) return $(PCH_HEADER) ] ;
|
||||
DEPENDS $(<) : [ on $(<) return $(PCH_FILE) ] ;
|
||||
}
|
||||
|
||||
actions compile.c++
|
||||
rule compile.c++ ( targets + : sources * : properties * )
|
||||
{
|
||||
$(.CC) /Zm800 -nologo -TP -U$(UNDEFS) $(CFLAGS) $(C++FLAGS) $(USER_CFLAGS) @"@($(<[1]:W).rsp:E=$(nl)"$(>)" $(nl)-D$(DEFINES) $(nl)"-I$(INCLUDES)")" -c -Fo"$(<[1]:W)"
|
||||
DEPENDS $(<) : [ on $(<) return $(PCH_HEADER) ] ;
|
||||
DEPENDS $(<) : [ on $(<) return $(PCH_FILE) ] ;
|
||||
}
|
||||
|
||||
rule compile.pch ( targets + : sources * : properties * )
|
||||
{
|
||||
DEPENDS $(<) : [ on $(<) return $(PCH_SOURCE) ] ;
|
||||
}
|
||||
|
||||
|
||||
# The actions differ only by explicit selection of input language
|
||||
actions compile.c bind PCH_HEADER PCH_FILE
|
||||
{
|
||||
$(.CC) /Zm800 -nologo -TC -U$(UNDEFS) $(CFLAGS) $(USER_CFLAGS) @"@($(<[1]:W).rsp:E=$(nl)"$(>)" $(nl)-D$(DEFINES) $(nl)"-I$(INCLUDES)")" -c -Fo"$(<[1]:W)" -Yu"$(PCH_HEADER:D=)" -Fp"$(PCH_FILE:W)"
|
||||
}
|
||||
|
||||
actions compile.c++ bind PCH_HEADER PCH_FILE
|
||||
{
|
||||
$(.CC) /Zm800 -nologo -TP -U$(UNDEFS) $(CFLAGS) $(C++FLAGS) $(USER_CFLAGS) @"@($(<[1]:W).rsp:E=$(nl)"$(>)" $(nl)-D$(DEFINES) $(nl)"-I$(INCLUDES)")" -c -Fo"$(<[1]:W)" -Yu"$(PCH_HEADER:D=)" -Fp"$(PCH_FILE:W)"
|
||||
}
|
||||
|
||||
actions compile.pch bind PCH_SOURCE
|
||||
{
|
||||
$(.CC) /Zm800 -nologo -TP -U$(UNDEFS) $(CFLAGS) $(C++FLAGS) $(USER_CFLAGS) @"@($(<[1]:W).rsp:E=$(nl)"$(PCH_SOURCE:W)" $(nl)-D$(DEFINES) $(nl)"-I$(INCLUDES)")" -c -Fo"$(<[1]:W)" /Yc"$(>[1]:D=)" -Fp"$(<[2]:W)"
|
||||
}
|
||||
|
||||
|
||||
actions compile.rc
|
||||
{
|
||||
$(.RC) -l 0x409 -U$(UNDEFS) -D$(DEFINES) -I"$(INCLUDES)" -fo "$(<:W)" "$(>:W)"
|
||||
|
||||
68
v2/tools/pch.jam
Normal file
68
v2/tools/pch.jam
Normal file
@ -0,0 +1,68 @@
|
||||
# Copyright (c) 2005 Reece H. Dunn.
|
||||
#
|
||||
# Use, modification and distribution is subject to the Boost Software
|
||||
# License Version 1.0. (See accompanying file LICENSE_1_0.txt or
|
||||
# http://www.boost.org/LICENSE_1_0.txt)
|
||||
|
||||
import type ;
|
||||
import feature : feature ;
|
||||
import generators ;
|
||||
|
||||
##### Using Pre-compiled Headers (Quick Guide) #####
|
||||
#
|
||||
# Make mypch.hpp a pre-compiled header (PCH) using mypch.cpp as the source file:
|
||||
# import cast ;
|
||||
# pch mypch : [ cast _ pcheader : pch.hpp ] pch.cpp ;
|
||||
#
|
||||
# Enable PCHs in a target:
|
||||
# exe hello : mypch main.cpp hello.cpp ;
|
||||
# ^^^^^ -- mypch.hpp is a PCH
|
||||
#
|
||||
# Don't use PCHs for a specific source:
|
||||
# obj nopch : nopch.cpp : <pch>off ;
|
||||
#
|
||||
|
||||
type.register PCH : pch ;
|
||||
type.register PCHEADER : pcheader ;
|
||||
|
||||
feature pch : # control precompiled header (PCH) generation
|
||||
on # this file has support for using PCHs (if available)
|
||||
off # this file doesn't use PCHs
|
||||
;
|
||||
|
||||
feature pch-source : : free dependency ; # mypch.cpp
|
||||
feature pch-header : : free dependency ; # mypch.h[pp]
|
||||
feature pch-file : : free dependency ; # mypch.pch
|
||||
|
||||
class pch-generator : generator
|
||||
{
|
||||
import property-set ;
|
||||
|
||||
rule __init__ ( * : * )
|
||||
{
|
||||
generator.__init__ $(1) : $(2) : $(3) : $(4) : $(5) : $(6) : $(7) : $(8) : $(9) ;
|
||||
}
|
||||
|
||||
rule action-class ( )
|
||||
{
|
||||
return compile-action ;
|
||||
}
|
||||
|
||||
rule run ( project name ? : property-set : sources * )
|
||||
{
|
||||
local r =
|
||||
[ generator.run $(project) $(name) :
|
||||
[
|
||||
property-set.create
|
||||
<pch-source>$(sources[2]) # mypch.cpp
|
||||
[ $(property-set).raw ]
|
||||
] : $(sources)
|
||||
] ;
|
||||
|
||||
return
|
||||
[ property-set.create
|
||||
<pch-header>$(sources[1]) # mypch.h[pp]
|
||||
<pch-file>$(r[2]) # mypch.pch
|
||||
] $(r) ;
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user