From f6e58e6145b27900031d9eef80c783c613d6bcf3 Mon Sep 17 00:00:00 2001 From: crivella Date: Fri, 4 Oct 2024 12:59:39 +0200 Subject: [PATCH] Store generate options to allow usage by children classes --- easybuild/easyblocks/generic/cmakemake.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/easybuild/easyblocks/generic/cmakemake.py b/easybuild/easyblocks/generic/cmakemake.py index cfdb73f02d..3e2bf0385a 100644 --- a/easybuild/easyblocks/generic/cmakemake.py +++ b/easybuild/easyblocks/generic/cmakemake.py @@ -34,21 +34,22 @@ @author: Maxime Boissonneault (Compute Canada - Universite Laval) """ import glob -import re import os -from easybuild.tools import LooseVersion +import re -from easybuild.easyblocks.generic.configuremake import ConfigureMake from easybuild.framework.easyconfig import BUILD, CUSTOM +from easybuild.tools import LooseVersion from easybuild.tools.build_log import EasyBuildError, print_warning from easybuild.tools.config import build_option -from easybuild.tools.filetools import change_dir, create_unused_dir, mkdir, which from easybuild.tools.environment import setvar +from easybuild.tools.filetools import (change_dir, create_unused_dir, mkdir, + which) from easybuild.tools.modules import get_software_root, get_software_version from easybuild.tools.run import run_cmd from easybuild.tools.systemtools import get_shared_lib_ext from easybuild.tools.utilities import nub +from easybuild.easyblocks.generic.configuremake import ConfigureMake DEFAULT_CONFIGURE_CMD = 'cmake' @@ -316,6 +317,8 @@ def configure_step(self, srcdir=None, builddir=None): options['BOOST_ROOT'] = boost_root options['Boost_NO_SYSTEM_PATHS'] = 'ON' + self.cmake_options = options + if self.cfg.get('configure_cmd') == DEFAULT_CONFIGURE_CMD: self.prepend_config_opts(options) command = ' '.join([