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

Adjust the search for project-config.jam.

Browse Source 
[SVN r52173]
This commit is contained in:
Vladimir Prus
2009-04-04 21:15:09 +00:00
parent ca203a0784
commit 2e5e78b713
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/build-system.jam
View File

@@ -388,14 +388,23 @@ local rule load-configuration-files
ECHO "notice: User configuration file loading explicitly disabled." ;
}
}
initialize-config-module project-config ;
if [ project.find "." : "." ]
# We look for project-config.jam from "." upward.
# I am not sure this is 100% right decision, we might as well check for
# it only alonside the Jamroot file. However:
#
# - We need to load project-root.jam before Jamroot
# - We probably would need to load project-root.jam even if there's no
# Jamroot - e.g. to implement automake-style out-of-tree builds.
local file = [ path.glob "." : project-config.jam ] ;
if ! $(file)
{
local project-module = [ project.load "." ] ;
local root = [ project.attribute $(project-module) project-root ] ;
load-config project-config : project-config.jam : $(root) ;
file = [ path.glob-in-parents "." : project-config.jam ] ;
}
if $(file)
{
initialize-config-module project-config ;
load-config project-config : project-config.jam : $(file:D) ;
}
}