diff --git a/config/BuildSystem/config/packages/cmake.py b/config/BuildSystem/config/packages/cmake.py index 75d6078bb3e..586f25dcd16 100644 --- a/config/BuildSystem/config/packages/cmake.py +++ b/config/BuildSystem/config/packages/cmake.py @@ -26,6 +26,12 @@ class Configure(config.package.GNUPackage): help.addArgument('CMAKE', '-with-ctest-exec=', nargs.Arg(None, None, 'Ctest executable to look for')) return + def setupDependencies(self, framework): + config.package.Package.setupDependencies(self, framework) + self.make = framework.require('config.packages.make',self) + self.odeps = [self.make] + return + def formGNUConfigureArgs(self): '''Does not use the standard arguments at all since this does not use the MPI compilers etc Cmake will chose its own compilers if they are not provided explicitly here''' @@ -37,6 +43,8 @@ class Configure(config.package.GNUPackage): args.append('CXX="'+self.argDB['download-cmake-cxx']+'"') if 'download-cmake-configure-options' in self.argDB and self.argDB['download-cmake-configure-options']: args.append(self.argDB['download-cmake-configure-options']) + if self.make.found: + os.environ['MAKE']=self.make.make return args def locateCMake(self):