Skip to content

make easyblock for installing CMake aware of --sysroot #2187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 25, 2020
Merged

make easyblock for installing CMake aware of --sysroot #2187

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion easybuild/easyblocks/c/cmake.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ def configure_step(self):

cmake_prefix_path = os.environ.get('CMAKE_PREFIX_PATH', '').split(':')
cmake_library_path = os.environ.get('CMAKE_LIBRARY_PATH', '').split(':')
cmake_include_path = []

available_system_options = ['BZIP2', 'CURL', 'EXPAT', 'LIBARCHIVE', 'ZLIB']
for dep in self.cfg.dependencies():
Expand All @@ -89,7 +90,19 @@ def configure_step(self):
if dep_name_upper in available_system_options and '-system-' + dep_name.lower() not in configure_opts:
add_cmake_opts['CMAKE_USE_SYSTEM_' + dep_name_upper] = 'ON'

for var, values in {'CMAKE_PREFIX_PATH': cmake_prefix_path, 'CMAKE_LIBRARY_PATH': cmake_library_path}.items():
sysroot = build_option('sysroot')
if sysroot:
self.log.info("Found sysroot '%s', adding it to $CMAKE_PREFIX_PATH and $CMAKE_LIBRARY_PATH", sysroot)
cmake_prefix_path.append(sysroot)
cmake_library_path.append(os.path.join(sysroot, 'usr', 'lib'))
cmake_include_path.append(os.path.join(sysroot, 'usr', 'include'))

cmake_path_env_vars = {
'CMAKE_PREFIX_PATH': cmake_prefix_path,
'CMAKE_LIBRARY_PATH': cmake_library_path,
'CMAKE_INCLUDE_PATH': cmake_include_path,
}
for var, values in cmake_path_env_vars.items():
value = ':'.join(values)
if os.environ.get(var, '') != value:
env.setvar(var, value)
Expand Down