Skip to content

set CMake installation LIBDIR to lib by default in CMakeMake easyblock #3227

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
boegel merged 6 commits into from
May 29, 2024
Merged

set CMake installation LIBDIR to lib by default in CMakeMake easyblock #3227

Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b41683a
set CMake installation LIBDIR to lib by default in CMakeMake easyblock
lexming Feb 14, 2024
805eae2
downgrade logs to info level about CMAKE_BUILD_TYPE and CMAKE_INSTALL…
lexming Mar 6, 2024
6235fab
fix typo in warning message about BUILD_SHARED_LIBS in configopts
lexming Mar 6, 2024
89d7de2
Merge branch '5.0.x' into cmake-libdir
lexming May 2, 2024
3880cc1
set CMAKE_INSTALL_LIBDIR as a path type
lexming May 3, 2024
a109930
allow disabling CMAKE_INSTALL_LIBDIR injection through install_libdir…
lexming May 27, 2024
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
16 changes: 14 additions & 2 deletions easybuild/easyblocks/generic/cmakemake.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ def extra_options(extra_vars=None):
'configure_cmd': [DEFAULT_CONFIGURE_CMD, "Configure command to use", CUSTOM],
'generator': [None, "Build file generator to use. None to use CMakes default", CUSTOM],
'install_target_subdir': [None, "Subdirectory to use as installation target", CUSTOM],
'install_libdir': ['lib', "Subdirectory to use for library installation files", CUSTOM],
'runtest': [None, "Make target to test build or True to use CTest", BUILD],
'srcdir': [None, "Source directory location to provide to cmake command", CUSTOM],
'separate_build_dir': [True, "Perform build in a separate directory", CUSTOM],
Expand Down Expand Up @@ -201,10 +202,21 @@ def configure_step(self, srcdir=None, builddir=None):

if '-DCMAKE_BUILD_TYPE=' in self.cfg['configopts']:
if self.cfg.get('build_type') is not None:
self.log.warning('CMAKE_BUILD_TYPE is set in configopts. Ignoring build_type')
self.log.info("CMAKE_BUILD_TYPE is set in configopts. Ignoring 'build_type' easyconfig parameter.")
else:
options['CMAKE_BUILD_TYPE'] = self.build_type

# Set installation directory for libraries
# any CMAKE_INSTALL_DIR[:PATH] setting defined in easyconfig has precedence
cmake_install_dir_pattern = re.compile(r"-DCMAKE_INSTALL_LIBDIR(:PATH)?=[^\s]")
if cmake_install_dir_pattern.search(self.cfg['configopts']):
self.log.info(
"CMAKE_INSTALL_LIBDIR is set in configopts. Ignoring 'install_libdir' easyconfig parameter."
)
else:
# set CMAKE_INSTALL_LIBDIR including its type to PATH, otherwise CMake can silently ignore it
options['CMAKE_INSTALL_LIBDIR:PATH'] = self.cfg['install_libdir']

# Add -fPIC flag if necessary
if self.toolchain.options['pic']:
options['CMAKE_POSITION_INDEPENDENT_CODE'] = 'ON'
Expand Down Expand Up @@ -232,7 +244,7 @@ def configure_step(self, srcdir=None, builddir=None):
# Usually you want to remove -DBUILD_SHARED_LIBS from configopts and set build_shared_libs to True or False
# If you need it in configopts don't set build_shared_libs (or explicitely set it to `None` (Default))
if '-DBUILD_SHARED_LIBS=' in self.cfg['configopts']:
print_warning('Ignoring BUILD_SHARED_LIBS is set in configopts because build_shared_libs is set')
print_warning('Ignoring BUILD_SHARED_LIBS setting in configopts because build_shared_libs is set')
self.cfg.update('configopts', '-DBUILD_SHARED_LIBS=%s' % ('ON' if build_shared_libs else 'OFF'))

# If the cache does not exist CMake reads the environment variables
Expand Down