Fix biicode-build script

This commit is contained in:
Victor Zverovich 2015-03-04 08:24:35 -08:00
parent 3a9b7ad8b6
commit cb40e7c60b
2 changed files with 3 additions and 3 deletions

View File

@ -11,8 +11,8 @@ cmake_program = 'cmake'
if os_name == 'linux':
# Install newer version of 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)
'cmake-3.1.1-Linux-i386.tar.gz', check_installed=False, download_dir=None, install_dir='.')
cmake_dir = glob.glob('cmake*')[0]
with Downloader().download('http://www.biicode.com/downloads/latest/ubuntu64') as f:
check_call(['sudo', 'dpkg', '-i', f])
elif os_name == 'osx':

View File

@ -94,7 +94,7 @@ def install_cmake(package, **kwargs):
if platform.system() == 'Darwin':
dir = glob.glob(os.path.join(dir, 'CMake*.app', 'Contents'))[0]
cmake_path = os.path.join(dir, 'bin', 'cmake')
if install_dir != '.' and kwargs.get('add_to_path', True):
if install_dir != '.':
add_to_path(cmake_path)
return cmake_path