mirror of
https://github.com/fmtlib/fmt.git
synced 2025-01-26 12:35:32 +00:00
Fix biicode-build script
This commit is contained in:
parent
3a9b7ad8b6
commit
cb40e7c60b
@ -11,8 +11,8 @@ cmake_program = 'cmake'
|
|||||||
if os_name == 'linux':
|
if os_name == 'linux':
|
||||||
# Install newer version of CMake.
|
# Install newer version of CMake.
|
||||||
cmake_program = 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='.')
|
||||||
download_dir=None, install_dir=cmake_dir, add_to_path=False)
|
cmake_dir = glob.glob('cmake*')[0]
|
||||||
with Downloader().download('http://www.biicode.com/downloads/latest/ubuntu64') as f:
|
with Downloader().download('http://www.biicode.com/downloads/latest/ubuntu64') as f:
|
||||||
check_call(['sudo', 'dpkg', '-i', f])
|
check_call(['sudo', 'dpkg', '-i', f])
|
||||||
elif os_name == 'osx':
|
elif os_name == 'osx':
|
||||||
|
@ -94,7 +94,7 @@ def install_cmake(package, **kwargs):
|
|||||||
if platform.system() == 'Darwin':
|
if platform.system() == 'Darwin':
|
||||||
dir = glob.glob(os.path.join(dir, 'CMake*.app', 'Contents'))[0]
|
dir = glob.glob(os.path.join(dir, 'CMake*.app', 'Contents'))[0]
|
||||||
cmake_path = os.path.join(dir, 'bin', 'cmake')
|
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)
|
add_to_path(cmake_path)
|
||||||
return cmake_path
|
return cmake_path
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user