From 29070901d4a36f0dbbc4f957aff69b3a97c58285 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Thu, 27 Feb 2020 16:35:51 +0100 Subject: [PATCH] Make use of the new default for build_type in CMakeMake --- easybuild/easyblocks/b/blender.py | 1 - easybuild/easyblocks/g/gromacs.py | 3 --- easybuild/easyblocks/n/netcdf.py | 2 -- easybuild/easyblocks/t/trilinos.py | 3 --- 4 files changed, 9 deletions(-) diff --git a/easybuild/easyblocks/b/blender.py b/easybuild/easyblocks/b/blender.py index e7d67af5b8f..ccd7e6c8040 100644 --- a/easybuild/easyblocks/b/blender.py +++ b/easybuild/easyblocks/b/blender.py @@ -43,7 +43,6 @@ class EB_Blender(CMakeMake): def extra_options(): extra_vars = CMakeMake.extra_options() extra_vars['separate_build_dir'][0] = True - extra_vars['build_type'][0] = 'Release' return extra_vars def find_glob_pattern(self, glob_pattern): diff --git a/easybuild/easyblocks/g/gromacs.py b/easybuild/easyblocks/g/gromacs.py index c65862627ea..8191cf91bd3 100644 --- a/easybuild/easyblocks/g/gromacs.py +++ b/easybuild/easyblocks/g/gromacs.py @@ -216,9 +216,6 @@ def configure_step(self): run_cmd(plumed_cmd, log_all=True, simple=True) - # Select debug or release build - self.cfg['build_type'] = 'Debug' if self.toolchain.options.get('debug', None) else 'Release' - # prefer static libraries, if available if self.toolchain.options.get('dynamic', False): self.cfg.update('configopts', "-DGMX_PREFER_STATIC_LIBS=OFF") diff --git a/easybuild/easyblocks/n/netcdf.py b/easybuild/easyblocks/n/netcdf.py index ceab2032639..3b33b527fce 100644 --- a/easybuild/easyblocks/n/netcdf.py +++ b/easybuild/easyblocks/n/netcdf.py @@ -74,8 +74,6 @@ def configure_step(self): ConfigureMake.configure_step(self) else: - self.cfg['build_type'] = 'Debug' if self.toolchain.options.get('debug', None) else 'Release' - for (dep, libname) in [('cURL', 'curl'), ('HDF5', 'hdf5'), ('Szip', 'sz'), ('zlib', 'z'), ('PnetCDF', 'pnetcdf')]: dep_root = get_software_root(dep) diff --git a/easybuild/easyblocks/t/trilinos.py b/easybuild/easyblocks/t/trilinos.py index eea52b52dbf..d0ae1ae85fe 100644 --- a/easybuild/easyblocks/t/trilinos.py +++ b/easybuild/easyblocks/t/trilinos.py @@ -97,9 +97,6 @@ def configure_step(self): self.log.deprecated("Use 'build_shared_libs' instead of 'shared_libs' easyconfig parameter", '5.0') self.cfg['build_shared_libs'] = self.cfg['shared_libs'] - # release or debug gversion - self.cfg['build_type'] = 'Debug' if self.toolchain.options.get('debug', None) else 'Release' - # enable full testing self.cfg.update('configopts', "-DTrilinos_ENABLE_TESTS:BOOL=ON") self.cfg.update('configopts', "-DTrilinos_ENABLE_ALL_FORWARD_DEP_PACKAGES:BOOL=ON")