AuroraMiddleware/fmtlegacy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use correct path to CMake bin directory

Browse Source
This commit is contained in:
Victor Zverovich 2015-03-04 07:36:30 -08:00
parent a6864a7264
commit 85ef48cb6d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
support/biicode-build.py
View File

@ -7,9 +7,10 @@ from subprocess import check_call
os_name = os.environ['TRAVIS_OS_NAME'] os_name = os.environ['TRAVIS_OS_NAME']
cmake_dir = 'cmake-dir' cmake_dir = 'cmake-dir'
cmake_program = 'cmake'
if os_name == 'linux': if os_name == 'linux':
# Install newer version of CMake. # Install newer version of CMake.
bootstrap.install_cmake( cmake_program = bootstrap.install_cmake(
'cmake-3.1.1-Linux-i386.tar.gz', check_installed=False, 'cmake-3.1.1-Linux-i386.tar.gz', check_installed=False,
download_dir=None, install_dir=cmake_dir, add_to_path=False) download_dir=None, install_dir=cmake_dir, add_to_path=False)
with Downloader().download('http://www.biicode.com/downloads/latest/ubuntu64') as f: with Downloader().download('http://www.biicode.com/downloads/latest/ubuntu64') as f:
@ -26,5 +27,5 @@ shutil.copytree('.', cppformat_dir,
for f in glob.glob('support/biicode/*'): for f in glob.glob('support/biicode/*'):
shutil.copy(f, cppformat_dir) shutil.copy(f, cppformat_dir)
env = os.environ.copy() env = os.environ.copy()
env['PATH'] = '../{}:{}'.format(cmake_dir, env['PATH']) env['PATH'] = os.path.dirname(cmake_program) + ':' + env['PATH']
check_call(['bii', 'cpp:build'], cwd=project_dir, env=env) check_call(['bii', 'cpp:build'], cwd=project_dir, env=env)