zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ Rename variant 'sphinxbuild' to 'doc' as recommended in the discussion of

Browse Source 
PR#526. Also, remove a debug print statement that was accidentally committed.
This commit is contained in:
Kelly (KT) Thompson 2016-03-11 09:51:12 -07:00
parent 280384fce3
commit f5e8857c5e
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
var/spack/repos/builtin/packages/cmake/package.py
View File

@ -39,12 +39,12 @@ class Cmake(Package):
variant('ncurses', default=True, description='Enables the build of the ncurses gui') variant('ncurses', default=True, description='Enables the build of the ncurses gui')
variant('qt', default=False, description='Enables the build of cmake-gui') variant('qt', default=False, description='Enables the build of cmake-gui')
variant('sphinxbuild', default=False, description='Enables the generation of html and man page documentation') variant('doc', default=False, description='Enables the generation of html and man page documentation')
depends_on('ncurses', when='+ncurses') depends_on('ncurses', when='+ncurses')
depends_on('qt', when='+qt') depends_on('qt', when='+qt')
depends_on('python@2.7.11:', when='+sphinxbuild') depends_on('python@2.7.11:', when='+doc')
depends_on('py-sphinx', when='+sphinxbuild') depends_on('py-sphinx', when='+doc')
def url_for_version(self, version): def url_for_version(self, version):
"""Handle CMake's version-based custom URLs.""" """Handle CMake's version-based custom URLs."""
@ -58,8 +58,6 @@ def validate(self, spec):
:raises RuntimeError: in case of inconsistencies :raises RuntimeError: in case of inconsistencies
""" """
print spec
if '+qt' in spec and spec.satisfies('^qt@5.4.0'): if '+qt' in spec and spec.satisfies('^qt@5.4.0'):
msg = 'qt-5.4.0 has broken CMake modules.' msg = 'qt-5.4.0 has broken CMake modules.'
raise RuntimeError(msg) raise RuntimeError(msg)
@ -75,7 +73,7 @@ def install(self, spec, prefix):
if '+qt' in spec: if '+qt' in spec:
options.append('--qt-gui') options.append('--qt-gui')
if '+sphinxbuild' in spec: if '+doc' in spec:
options.append('--sphinx-html') options.append('--sphinx-html')
options.append('--sphinx-man') options.append('--sphinx-man')