tweaks to packages using CMakePackage (#2241)

* fix to trilinos package

* fix to dealii package

* fix to everytrace package

* fix to everytrace-example package

* changes suggested by @davydden

var/spack/repos/builtin/packages/dealii/package.py

@@ -117,19 +117,16 @@ class Dealii(CMakePackage):
     depends_on("numdiff",     when='@develop')
     depends_on("astyle@2.04", when='@develop')
 
+    def build_type(self):
+        # CMAKE_BUILD_TYPE should be DebugRelease | Debug | Release
+        return 'DebugRelease'
+
     def cmake_args(self):
         spec = self.spec
         options = []
-        options.extend(std_cmake_args)
-
-        # CMAKE_BUILD_TYPE should be DebugRelease | Debug | Release
-        for word in options[:]:
-            if word.startswith('-DCMAKE_BUILD_TYPE'):
-                options.remove(word)
 
         lapack_blas = spec['lapack'].lapack_libs + spec['blas'].blas_libs
         options.extend([
-            '-DCMAKE_BUILD_TYPE=DebugRelease',
             '-DDEAL_II_COMPONENT_EXAMPLES=ON',
             '-DDEAL_II_WITH_THREADS:BOOL=ON',
             '-DBOOST_DIR=%s' % spec['boost'].prefix,

var/spack/repos/builtin/packages/everytrace-example/package.py

@@ -39,8 +39,5 @@ class EverytraceExample(CMakePackage):
     # Currently the only MPI this everytrace works with.
     depends_on('openmpi')
 
-    def configure_args(self):
-        return []
-
     def setup_environment(self, spack_env, env):
         env.prepend_path('PATH', join_path(self.prefix, 'bin'))

var/spack/repos/builtin/packages/everytrace/package.py

@@ -42,7 +42,7 @@ class Everytrace(CMakePackage):
     depends_on('cmake', type='build')
     depends_on('mpi', when='+mpi')
 
-    def configure_args(self):
+    def cmake_args(self):
         spec = self.spec
         return [
             '-DUSE_MPI=%s' % ('YES' if '+mpi' in spec else 'NO'),

var/spack/repos/builtin/packages/trilinos/package.py

@@ -130,7 +130,6 @@ def cmake_args(self):
 
         cxx_flags = []
         options = []
-        options.extend(std_cmake_args)
 
         mpi_bin = spec['mpi'].prefix.bin
         # Note: -DXYZ_LIBRARY_NAMES= needs semicolon separated list of names