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

Full merge from trunk at revision 41356 of entire boost-root tree.

Browse Source 
[SVN r41373]
This commit is contained in:
Beman Dawes
2007-11-25 19:36:19 +00:00
parent d4b923c4ca
commit 930368bf0a
3 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
v2/build/project.jam
View File

@@ -1007,7 +1007,15 @@ module project-rules
#
rule conditional ( condition + : requirements * )
{
return $(condition:J=,):$(requirements) ;
local condition = $(condition:J=,) ;
if [ MATCH (:) : $(condition) ]
{
return $(condition)$(requirements) ;
}
else
{
return $(condition):$(requirements) ;
}
}
}

26
v2/example/qt/qt4/hello/Jamroot
View File

@@ -1,14 +1,14 @@
import qt4 ;
if ! [ qt4.initialized ]
{
ECHO "Warning: Qt4 not initialized in user-config.jam" ;
ECHO "Assuming /space/p2/ghost/build/Qt4 as location." ;
ECHO "This is very likely won't work for you. " ;
using qt4 : /space/p2/ghost/build/Qt4 ;
}
project : requirements <threading>multi ;
import qt4 ;
if ! [ qt4.initialized ]
{
ECHO "Warning: Qt4 not initialized in user-config.jam" ;
ECHO "Assuming /space/p2/ghost/build/Qt4 as location." ;
ECHO "This is very likely won't work for you. " ;
using qt4 : /space/p2/ghost/build/Qt4 ;
}
project : requirements <threading>multi ;
exe arrow : main.cpp arrow.cpp arrow.h /qt//QtGui ;

8
v2/tools/pathscale.jam
View File

@@ -23,19 +23,19 @@ rule init ( version ? : command * : options * )
{
local condition = [ common.check-init-parameters pathscale : version $(version) ] ;
command = [ common.get-invocation-command pathscale : mpicxx : $(command) ] ;
command = [ common.get-invocation-command pathscale : pathCC : $(command) ] ;
common.handle-options pathscale : $(condition) : $(command) : $(options) ;
toolset.flags pathscale.compile.fortran90 OPTIONS $(condition) :
[ feature.get-values <fflags> : $(options) ] : unchecked ;
command_c = $(command_c[1--2]) $(command[-1]:B=mpicxx) ;
command_c = $(command_c[1--2]) $(command[-1]:B=pathCC) ;
toolset.flags pathscale CONFIG_C_COMMAND $(condition) : $(command_c) ;
# fortran support
local f-command = [ common.get-invocation-command pathscale : mpif77 : $(command) ] ;
local f-command = [ common.get-invocation-command pathscale : pathf90 : $(command) ] ;
local command_f = $(command_f[1--2]) $(f-command[-1]:B=pathf77) ;
local command_f90 = $(command_f[1--2]) $(f-command[-1]:B=pathf90) ;
@@ -84,7 +84,7 @@ actions compile.c++
actions compile.fortran
{
"$(CONFIG_F_COMMAND)" $(OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -o "$(<)" "$(>)"
"$(CONFIG_F_COMMAND)" -f77 $(OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -o "$(<)" "$(>)"
}
rule compile.fortran90 ( targets * : sources * : properties * )