diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-11-17 09:16:54 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-11-17 09:16:54 +0400 |
| commit | 38eee0104b78e25963569d17116f1917b74f5419 (patch) | |
| tree | c71bb317b2cab454fe54896dde98db79e20a92cf | |
| parent | 79f651a2e5ed52f7ff2041d66b707b886e80b617 (diff) | |
quiet scons deprecation warnings and correct --with_filesystem --> --with-filesystem in install_deps.sh
| -rw-r--r-- | SConstruct | 6 | ||||
| -rwxr-xr-x | build_files/build_environment/install_deps.sh | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/SConstruct b/SConstruct index 42be4ac191b..d6d48fcdefe 100644 --- a/SConstruct +++ b/SConstruct @@ -582,11 +582,11 @@ B.init_lib_dict() Export('env') -BuildDir(B.root_build_dir+'/source', 'source', duplicate=0) +VariantDir(B.root_build_dir+'/source', 'source', duplicate=0) SConscript(B.root_build_dir+'/source/SConscript') -BuildDir(B.root_build_dir+'/intern', 'intern', duplicate=0) +VariantDir(B.root_build_dir+'/intern', 'intern', duplicate=0) SConscript(B.root_build_dir+'/intern/SConscript') -BuildDir(B.root_build_dir+'/extern', 'extern', duplicate=0) +VariantDir(B.root_build_dir+'/extern', 'extern', duplicate=0) SConscript(B.root_build_dir+'/extern/SConscript') # now that we have read all SConscripts, we know what diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index bc0c39e3040..575e79c3b3f 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -216,7 +216,7 @@ compile_Boost() { if [ ! -f $_src/b2 ]; then ./bootstrap.sh fi - ./b2 -j$THREADS -a --with-system --with_filesystem --with-thread --with-regex --with-locale --with-date_time \ + ./b2 -j$THREADS -a --with-system --with-filesystem --with-thread --with-regex --with-locale --with-date_time \ --prefix=$_inst --disable-icu boost.locale.icu=off install ./b2 --clean |