diff --git a/support/biicode-build.py b/support/biicode-build.py index 33ecaca0..33b4dd47 100755 --- a/support/biicode-build.py +++ b/support/biicode-build.py @@ -7,9 +7,10 @@ from subprocess import check_call os_name = os.environ['TRAVIS_OS_NAME'] cmake_dir = 'cmake-dir' +cmake_program = 'cmake' if os_name == 'linux': # Install newer version of CMake. - bootstrap.install_cmake( + cmake_program = bootstrap.install_cmake( 'cmake-3.1.1-Linux-i386.tar.gz', check_installed=False, download_dir=None, install_dir=cmake_dir, add_to_path=False) 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/*'): shutil.copy(f, cppformat_dir) 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)