Remove cmake build dep from CMakePackages (#2684)
This commit is contained in:
parent
7fce4c5083
commit
f2d4c15395
@ -155,10 +155,6 @@ class CMakeGuess(DefaultGuess):
|
|||||||
"""Provides appropriate overrides for cmake-based packages"""
|
"""Provides appropriate overrides for cmake-based packages"""
|
||||||
base_class_name = 'CMakePackage'
|
base_class_name = 'CMakePackage'
|
||||||
|
|
||||||
dependencies = """\
|
|
||||||
# FIXME: Add additional dependencies if required.
|
|
||||||
depends_on('cmake', type='build')"""
|
|
||||||
|
|
||||||
body = """\
|
body = """\
|
||||||
def cmake_args(self):
|
def cmake_args(self):
|
||||||
# FIXME: Add arguments other than
|
# FIXME: Add arguments other than
|
||||||
|
@ -33,7 +33,6 @@ class EverytraceExample(CMakePackage):
|
|||||||
git='https://github.com/citibeth/everytrace-example.git',
|
git='https://github.com/citibeth/everytrace-example.git',
|
||||||
branch='develop')
|
branch='develop')
|
||||||
|
|
||||||
depends_on('cmake', type='build')
|
|
||||||
depends_on('everytrace+mpi+fortran')
|
depends_on('everytrace+mpi+fortran')
|
||||||
|
|
||||||
# Currently the only MPI this everytrace works with.
|
# Currently the only MPI this everytrace works with.
|
||||||
|
@ -39,7 +39,6 @@ class Everytrace(CMakePackage):
|
|||||||
variant('fortran', default=True,
|
variant('fortran', default=True,
|
||||||
description='Enable use with Fortran programs')
|
description='Enable use with Fortran programs')
|
||||||
|
|
||||||
depends_on('cmake', type='build')
|
|
||||||
depends_on('mpi', when='+mpi')
|
depends_on('mpi', when='+mpi')
|
||||||
|
|
||||||
def cmake_args(self):
|
def cmake_args(self):
|
||||||
|
@ -64,7 +64,6 @@ class Ibmisc(CMakePackage):
|
|||||||
depends_on('boost', when='+boost')
|
depends_on('boost', when='+boost')
|
||||||
|
|
||||||
# Build dependencies
|
# Build dependencies
|
||||||
depends_on('cmake', type='build')
|
|
||||||
depends_on('doxygen', type='build')
|
depends_on('doxygen', type='build')
|
||||||
|
|
||||||
def cmake_args(self):
|
def cmake_args(self):
|
||||||
|
@ -36,7 +36,6 @@ class Icet(CMakePackage):
|
|||||||
git='https://gitlab.kitware.com/icet/icet.git')
|
git='https://gitlab.kitware.com/icet/icet.git')
|
||||||
version('2.1.1', '4f971c51105a64937460d482adca2a6c')
|
version('2.1.1', '4f971c51105a64937460d482adca2a6c')
|
||||||
|
|
||||||
depends_on('cmake', type='build')
|
|
||||||
depends_on('mpi')
|
depends_on('mpi')
|
||||||
|
|
||||||
def url_for_version(self, version):
|
def url_for_version(self, version):
|
||||||
|
@ -33,5 +33,3 @@ class Jansson(CMakePackage):
|
|||||||
url = "https://github.com/akheron/jansson/archive/v2.9.tar.gz"
|
url = "https://github.com/akheron/jansson/archive/v2.9.tar.gz"
|
||||||
|
|
||||||
version('2.9', 'd2db25c437b359fc5a065ed938962237')
|
version('2.9', 'd2db25c437b359fc5a065ed938962237')
|
||||||
|
|
||||||
depends_on('cmake', type='build')
|
|
||||||
|
@ -30,5 +30,3 @@ class Libspatialindex(CMakePackage):
|
|||||||
url = "https://github.com/libspatialindex/libspatialindex/tarball/1.8.5"
|
url = "https://github.com/libspatialindex/libspatialindex/tarball/1.8.5"
|
||||||
|
|
||||||
version('1.8.5', 'a95d8159714dbda9a274792cd273d298')
|
version('1.8.5', 'a95d8159714dbda9a274792cd273d298')
|
||||||
|
|
||||||
depends_on("cmake", type='build')
|
|
||||||
|
@ -35,6 +35,5 @@ class Libwebsockets(CMakePackage):
|
|||||||
version('2.0.3', 'a025156d606d90579e65d53ccd062a94')
|
version('2.0.3', 'a025156d606d90579e65d53ccd062a94')
|
||||||
version('1.7.9', '7b3692ead5ae00fd0e1d56c080170f07')
|
version('1.7.9', '7b3692ead5ae00fd0e1d56c080170f07')
|
||||||
|
|
||||||
depends_on('cmake', type='build')
|
|
||||||
depends_on('zlib')
|
depends_on('zlib')
|
||||||
depends_on('openssl')
|
depends_on('openssl')
|
||||||
|
@ -90,8 +90,6 @@ def url_for_version(self, version):
|
|||||||
description='Builds a debug version of the libraries')
|
description='Builds a debug version of the libraries')
|
||||||
variant('boost', default=True, description='Compile with Boost')
|
variant('boost', default=True, description='Compile with Boost')
|
||||||
|
|
||||||
depends_on('cmake', type='build')
|
|
||||||
|
|
||||||
# Everything should be compiled with -fpic
|
# Everything should be compiled with -fpic
|
||||||
depends_on('blas')
|
depends_on('blas')
|
||||||
depends_on('lapack')
|
depends_on('lapack')
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
|
|
||||||
class Xsdktrilinos(CMakePackage):
|
class Xsdktrilinos(CMakePackage):
|
||||||
"""xSDKTrilinos contains the portions of Trilinos that depend on PETSc
|
"""xSDKTrilinos contains the portions of Trilinos that depend on PETSc
|
||||||
because they would cause a circular dependency if built as part of
|
because they would cause a circular dependency if built as part of
|
||||||
Trilinos.
|
Trilinos.
|
||||||
"""
|
"""
|
||||||
homepage = "https://trilinos.org/"
|
homepage = "https://trilinos.org/"
|
||||||
@ -51,8 +51,6 @@ def url_for_version(self, version):
|
|||||||
variant('debug', default=False,
|
variant('debug', default=False,
|
||||||
description='Builds a debug version of the libraries')
|
description='Builds a debug version of the libraries')
|
||||||
|
|
||||||
depends_on('cmake', type='build')
|
|
||||||
|
|
||||||
# MPI related dependencies
|
# MPI related dependencies
|
||||||
depends_on('mpi')
|
depends_on('mpi')
|
||||||
depends_on('hypre~internal-superlu', when='+hypre')
|
depends_on('hypre~internal-superlu', when='+hypre')
|
||||||
|
Loading…
Reference in New Issue
Block a user