Skip to content

Commit

Permalink
Store generate options to allow usage by children classes
Browse files Browse the repository at this point in the history
  • Loading branch information
Crivella committed Oct 4, 2024
1 parent 2878569 commit f6e58e6
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions easybuild/easyblocks/generic/cmakemake.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down Expand Up @@ -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([
Expand Down

0 comments on commit f6e58e6

Please sign in to comment.