Merge branch 'easybuilders:develop' into llvm

Author: julianmorillo

easybuild/easyblocks/a/armadillo.py

@@ -38,13 +38,6 @@
 class EB_Armadillo(CMakeMake):
     """Support for building Armadillo."""
 
-    @staticmethod
-    def extra_options():
-        """Extra easyconfig parameters for Armadillo."""
-        extra_vars = CMakeMake.extra_options()
-        extra_vars['separate_build_dir'][0] = True
-        return extra_vars
-
     def configure_step(self):
         """Set some extra environment variables before configuring."""
 

easybuild/easyblocks/c/cgal.py

@@ -42,12 +42,6 @@
 class EB_CGAL(CMakeMake):
     """Support for building CGAL."""
 
-    @staticmethod
-    def extra_options():
-        extra_vars = CMakeMake.extra_options()
-        extra_vars['separate_build_dir'][0] = True
-        return extra_vars
-
     def configure_step(self):
         """Set some extra environment variables before configuring."""
 

easybuild/easyblocks/e/elsi.py

@@ -52,7 +52,6 @@ def extra_options():
         extra_vars.update({
             'build_internal_pexsi': [None, "Build internal PEXSI solver", CUSTOM],
         })
-        extra_vars['separate_build_dir'][0] = True
         extra_vars['build_shared_libs'][0] = True
         return extra_vars
 

easybuild/easyblocks/f/flexiblas.py

@@ -63,7 +63,6 @@ def extra_options():
                          "'imkl', which does not need to be a (build)dependency." +
                          "If not defined, use the list of dependencies.", CUSTOM],
         })
-        extra_vars['separate_build_dir'][0] = True
         return extra_vars
 
     def __init__(self, *args, **kwargs):

easybuild/easyblocks/g/geant4.py

@@ -57,8 +57,6 @@ def extra_options():
             'PhotonEvaporationVersion': [None, "PhotonEvaporation version", CUSTOM],
             'G4RadioactiveDecayVersion': [None, "G4RadioactiveDecay version", CUSTOM],
         })
-        # Requires out-of-source build
-        extra_vars['separate_build_dir'][0] = True
         return extra_vars
 
     def make_module_extra(self):

easybuild/easyblocks/g/gromacs.py

@@ -75,7 +75,6 @@ def extra_options():
             'plumed': [None, "Try to apply PLUMED patches. None (default) is auto-detect. " +
                        "True or False forces behaviour.", CUSTOM],
         })
-        extra_vars['separate_build_dir'][0] = True
         return extra_vars
 
     def __init__(self, *args, **kwargs):

easybuild/easyblocks/generic/cmakemake.py

@@ -407,15 +407,16 @@ def configure_step(self, srcdir=None, builddir=None):
 
     def check_python_paths(self):
         """Check that there are no detected Python paths outside the Python dependency provided by EasyBuild"""
-        if not os.path.exists('CMakeCache.txt'):
-            self.log.warning("CMakeCache.txt not found. Python paths checks skipped.")
+        cache_file_path = os.path.join(os.getcwd(), 'CMakeCache.txt')
+        if not os.path.exists(cache_file_path):
+            self.log.warning(f"{cache_file_path} not found. Python paths checks skipped.")
             return
-        cmake_cache = read_file('CMakeCache.txt')
+        cmake_cache = read_file(cache_file_path)
         if not cmake_cache:
-            self.log.warning("CMake Cache could not be read. Python paths checks skipped.")
+            self.log.warning(f"CMake Cache ({cache_file_path}) could not be read. Python paths checks skipped.")
             return
 
-        self.log.info("Checking Python paths")
+        self.log.info(f"Checking Python paths found by CMake in {cache_file_path}")
 
         python_paths = {
             "executable": [],
@@ -438,7 +439,7 @@ def check_python_paths(self):
 
         ebrootpython_path = get_software_root("Python")
         if not ebrootpython_path:
-            if any(python_paths.values()) and not self.toolchain.comp_family() == toolchain.SYSTEM:
+            if any(python_paths.values()) and self.toolchain.comp_family() != toolchain.SYSTEM:
                 self.log.warning("Found Python paths in CMake cache but Python is not a dependency")
             # Can't do the check
             return
@@ -456,8 +457,12 @@ def check_python_paths(self):
         if errors:
             # Combine all errors into a single message
             error_message = "\n".join(errors)
-            raise EasyBuildError("Python path errors:\n" + error_message)
-        self.log.info("Python check successful")
+            raise EasyBuildError("CMake configure of {self.name} picked up (likely) wrong Python paths:\n"
+                                 f"{error_message}\n"
+                                 "Verify that Python is a dependency. "
+                                 "Otherwise, the sources might need patching "
+                                 "to pick up the Python provided by EasyBuild.")
+        self.log.info("Check for Python paths in CMake cache successful")
 
     def test_step(self):
         """CMake specific test setup"""

easybuild/easyblocks/l/lammps.py

@@ -244,7 +244,6 @@ def extra_options(**kwargs):
             'user_packages': [None, "List user packages (without prefix PKG_ or USER-PKG_).", CUSTOM],
             'sanity_check_test_inputs': [None, "List of tests for sanity-check.", CUSTOM],
         })
-        extra_vars['separate_build_dir'][0] = True
         return extra_vars
 
     def prepare_step(self, *args, **kwargs):

easybuild/easyblocks/n/netcdf.py

@@ -47,12 +47,6 @@
 class EB_netCDF(CMakeMake):
     """Support for building/installing netCDF"""
 
-    @staticmethod
-    def extra_options():
-        extra_vars = CMakeMake.extra_options()
-        extra_vars['separate_build_dir'][0] = True
-        return extra_vars
-
     def configure_step(self):
         """Configure build: set config options and configure"""
 

easybuild/easyblocks/o/openbabel.py

@@ -47,7 +47,6 @@ def extra_options():
         extra_vars.update({
             'with_python_bindings': [True, "Try to build Open Babel's Python bindings. (-DPYTHON_BINDINGS=ON)", CUSTOM],
         })
-        extra_vars['separate_build_dir'][0] = True
         return extra_vars
 
     def __init__(self, *args, **kwargs):