From f2d4c15395b04ff4ca181ca7b1ddfe2bb7a3bee5 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Sun, 15 Jan 2017 05:18:52 -0600 Subject: Remove cmake build dep from CMakePackages (#2684) --- lib/spack/spack/cmd/create.py | 4 ---- var/spack/repos/builtin/packages/everytrace-example/package.py | 1 - var/spack/repos/builtin/packages/everytrace/package.py | 1 - var/spack/repos/builtin/packages/ibmisc/package.py | 1 - var/spack/repos/builtin/packages/icet/package.py | 1 - var/spack/repos/builtin/packages/jansson/package.py | 2 -- var/spack/repos/builtin/packages/libspatialindex/package.py | 2 -- var/spack/repos/builtin/packages/libwebsockets/package.py | 1 - var/spack/repos/builtin/packages/trilinos/package.py | 2 -- var/spack/repos/builtin/packages/xsdktrilinos/package.py | 4 +--- 10 files changed, 1 insertion(+), 18 deletions(-) diff --git a/lib/spack/spack/cmd/create.py b/lib/spack/spack/cmd/create.py index 2d25e8c8a9..cac67f22af 100644 --- a/lib/spack/spack/cmd/create.py +++ b/lib/spack/spack/cmd/create.py @@ -155,10 +155,6 @@ class CMakeGuess(DefaultGuess): """Provides appropriate overrides for cmake-based packages""" base_class_name = 'CMakePackage' - dependencies = """\ - # FIXME: Add additional dependencies if required. - depends_on('cmake', type='build')""" - body = """\ def cmake_args(self): # FIXME: Add arguments other than diff --git a/var/spack/repos/builtin/packages/everytrace-example/package.py b/var/spack/repos/builtin/packages/everytrace-example/package.py index 8c49e04634..76b437a38a 100644 --- a/var/spack/repos/builtin/packages/everytrace-example/package.py +++ b/var/spack/repos/builtin/packages/everytrace-example/package.py @@ -33,7 +33,6 @@ class EverytraceExample(CMakePackage): git='https://github.com/citibeth/everytrace-example.git', branch='develop') - depends_on('cmake', type='build') depends_on('everytrace+mpi+fortran') # Currently the only MPI this everytrace works with. diff --git a/var/spack/repos/builtin/packages/everytrace/package.py b/var/spack/repos/builtin/packages/everytrace/package.py index a3f3e2cfce..d884c7b165 100644 --- a/var/spack/repos/builtin/packages/everytrace/package.py +++ b/var/spack/repos/builtin/packages/everytrace/package.py @@ -39,7 +39,6 @@ class Everytrace(CMakePackage): variant('fortran', default=True, description='Enable use with Fortran programs') - depends_on('cmake', type='build') depends_on('mpi', when='+mpi') def cmake_args(self): diff --git a/var/spack/repos/builtin/packages/ibmisc/package.py b/var/spack/repos/builtin/packages/ibmisc/package.py index 7365eac46a..f325205507 100644 --- a/var/spack/repos/builtin/packages/ibmisc/package.py +++ b/var/spack/repos/builtin/packages/ibmisc/package.py @@ -64,7 +64,6 @@ class Ibmisc(CMakePackage): depends_on('boost', when='+boost') # Build dependencies - depends_on('cmake', type='build') depends_on('doxygen', type='build') def cmake_args(self): diff --git a/var/spack/repos/builtin/packages/icet/package.py b/var/spack/repos/builtin/packages/icet/package.py index cdace1481f..f8260f1951 100644 --- a/var/spack/repos/builtin/packages/icet/package.py +++ b/var/spack/repos/builtin/packages/icet/package.py @@ -36,7 +36,6 @@ class Icet(CMakePackage): git='https://gitlab.kitware.com/icet/icet.git') version('2.1.1', '4f971c51105a64937460d482adca2a6c') - depends_on('cmake', type='build') depends_on('mpi') def url_for_version(self, version): diff --git a/var/spack/repos/builtin/packages/jansson/package.py b/var/spack/repos/builtin/packages/jansson/package.py index 8ba7829bbc..e6100607aa 100644 --- a/var/spack/repos/builtin/packages/jansson/package.py +++ b/var/spack/repos/builtin/packages/jansson/package.py @@ -33,5 +33,3 @@ class Jansson(CMakePackage): url = "https://github.com/akheron/jansson/archive/v2.9.tar.gz" version('2.9', 'd2db25c437b359fc5a065ed938962237') - - depends_on('cmake', type='build') diff --git a/var/spack/repos/builtin/packages/libspatialindex/package.py b/var/spack/repos/builtin/packages/libspatialindex/package.py index 731e47a991..5dd839a7c3 100644 --- a/var/spack/repos/builtin/packages/libspatialindex/package.py +++ b/var/spack/repos/builtin/packages/libspatialindex/package.py @@ -30,5 +30,3 @@ class Libspatialindex(CMakePackage): url = "https://github.com/libspatialindex/libspatialindex/tarball/1.8.5" version('1.8.5', 'a95d8159714dbda9a274792cd273d298') - - depends_on("cmake", type='build') diff --git a/var/spack/repos/builtin/packages/libwebsockets/package.py b/var/spack/repos/builtin/packages/libwebsockets/package.py index 904ad887ec..3ce58a4c36 100644 --- a/var/spack/repos/builtin/packages/libwebsockets/package.py +++ b/var/spack/repos/builtin/packages/libwebsockets/package.py @@ -35,6 +35,5 @@ class Libwebsockets(CMakePackage): version('2.0.3', 'a025156d606d90579e65d53ccd062a94') version('1.7.9', '7b3692ead5ae00fd0e1d56c080170f07') - depends_on('cmake', type='build') depends_on('zlib') depends_on('openssl') diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index 7558430953..4b3412ce7a 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -90,8 +90,6 @@ class Trilinos(CMakePackage): description='Builds a debug version of the libraries') variant('boost', default=True, description='Compile with Boost') - depends_on('cmake', type='build') - # Everything should be compiled with -fpic depends_on('blas') depends_on('lapack') diff --git a/var/spack/repos/builtin/packages/xsdktrilinos/package.py b/var/spack/repos/builtin/packages/xsdktrilinos/package.py index 7aea15ed9c..ea49054435 100644 --- a/var/spack/repos/builtin/packages/xsdktrilinos/package.py +++ b/var/spack/repos/builtin/packages/xsdktrilinos/package.py @@ -28,7 +28,7 @@ import os class Xsdktrilinos(CMakePackage): """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. """ homepage = "https://trilinos.org/" @@ -51,8 +51,6 @@ class Xsdktrilinos(CMakePackage): variant('debug', default=False, description='Builds a debug version of the libraries') - depends_on('cmake', type='build') - # MPI related dependencies depends_on('mpi') depends_on('hypre~internal-superlu', when='+hypre') -- cgit v1.2.3-70-g09d2