Reverted bad change

This commit is contained in:
citibeth 2016-03-13 00:33:13 -05:00
parent c1a8574d8f
commit 003957a689

View file

@ -1,5 +1,4 @@
from spack import * from spack import *
import llnl.util.tty as tty
class Ibmisc(CMakePackage): class Ibmisc(CMakePackage):
"""Misc. reusable utilities used by IceBin.""" """Misc. reusable utilities used by IceBin."""
@ -16,7 +15,7 @@ class Ibmisc(CMakePackage):
variant('boost', default=True, description='Compile utilities for Boost library') variant('boost', default=True, description='Compile utilities for Boost library')
variant('udunits2', default=True, description='Compile utilities for UDUNITS2 library') variant('udunits2', default=True, description='Compile utilities for UDUNITS2 library')
variant('googletest', default=True, description='Compile utilities for Google Test library') variant('googletest', default=True, description='Compile utilities for Google Test library')
variant('python', default=True, description='Compile utilities fro use with Python/Cython') variant('python', default=True, description='Compile utilities for use with Python/Cython')
extends('python') extends('python')
@ -27,18 +26,16 @@ class Ibmisc(CMakePackage):
depends_on('netcdf-cxx4', when='+netcdf') depends_on('netcdf-cxx4', when='+netcdf')
depends_on('udunits2', when='+udunits2') depends_on('udunits2', when='+udunits2')
depends_on('googletest', when='+googletest') depends_on('googletest', when='+googletest')
# depends_on('python', when='+python')
depends_on('py-cython', when='+python') depends_on('py-cython', when='+python')
depends_on('py-numpy', when='+python') depends_on('py-numpy', when='+python')
depends_on('boost', when='+boost') depends_on('boost', when='+boost')
# Build dependencies # Build dependencies
depends_on('cmake') depends_on('cmake')
depends_on('doxygen') depends_on('doxygen')
def config_args(self, spec, prefix): def configure_args(self):
spec = self.spec
return [ return [
'-DUSE_EVERYTRACE=%s' % ('YES' if '+everytrace' in spec else 'NO'), '-DUSE_EVERYTRACE=%s' % ('YES' if '+everytrace' in spec else 'NO'),
'-DUSE_PROJ4=%s' % ('YES' if '+proj' in spec else 'NO'), '-DUSE_PROJ4=%s' % ('YES' if '+proj' in spec else 'NO'),
@ -47,4 +44,3 @@ def config_args(self, spec, prefix):
'-DUSE_BOOST=%s' % ('YES' if '+boost' in spec else 'NO'), '-DUSE_BOOST=%s' % ('YES' if '+boost' in spec else 'NO'),
'-DUSE_UDUNITS2=%s' % ('YES' if '+udunits2' in spec else 'NO'), '-DUSE_UDUNITS2=%s' % ('YES' if '+udunits2' in spec else 'NO'),
'-DUSE_GTEST=%s' % ('YES' if '+googletest' in spec else 'NO')] '-DUSE_GTEST=%s' % ('YES' if '+googletest' in spec else 'NO')]