diff options
| author | Robert Blake <blake14@llnl.gov> | 2020-06-09 14:13:54 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-09 16:13:54 -0500 |
| commit | 872ab2110318524cbf805215e09a457a5ff4cba4 (patch) | |
| tree | f8bc6b9b1002cced006a7768b0a144bbb57e19d7 | |
| parent | 806a19c6b63acccb7c0e58a27f46ccf4c7db3f2c (diff) | |
| download | spack-872ab2110318524cbf805215e09a457a5ff4cba4.tar.gz spack-872ab2110318524cbf805215e09a457a5ff4cba4.tar.bz2 spack-872ab2110318524cbf805215e09a457a5ff4cba4.tar.xz spack-872ab2110318524cbf805215e09a457a5ff4cba4.zip | |
Add new package: wcs (#16958)
* Adding a package for wcs.
* Turning on sbml for wcs.
* The cpp flag needs to be available for wcs.
* Wcs needs SBML to properly define the namespace.
* Flake8 fixes.
* Fixing the help string with the description.
* Changing cpp to use the new variant syntax.
* Fixing flake8 errors.
* Forgot to delete one last fixme comment.
* Spack "develop" needs to link to repo "devel"
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
Co-authored-by: Robert Blake <rob.c.blake.3@gmail.com>
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
| -rw-r--r-- | var/spack/repos/builtin/packages/sbml/package.py | 5 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/wcs/package.py | 33 |
2 files changed, 37 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/sbml/package.py b/var/spack/repos/builtin/packages/sbml/package.py index 4c90d76bc2..22c608d156 100644 --- a/var/spack/repos/builtin/packages/sbml/package.py +++ b/var/spack/repos/builtin/packages/sbml/package.py @@ -59,6 +59,9 @@ class Sbml(CMakePackage): description='Build with mono support') depends_on('mono', when="+mono") + variant('cpp', default=False, + description="All c++ includes should be under a namespace") + depends_on('swig@2:', type='build') depends_on('cmake', type='build') depends_on('zlib') @@ -76,7 +79,6 @@ class Sbml(CMakePackage): "-DENABLE_RENDER:BOOL=ON", "-DWITH_BZIP2:BOOL=ON", "-DWITH_CHECK:BOOL=OFF", - "-DWITH_CPP_NAMESPACE:BOOL=OFF", "-DWITH_DOXYGEN:BOOL=OFF", "-DWITH_EXAMPLES:BOOL=OFF", "-DWITH_EXPAT:BOOL=OFF", @@ -86,6 +88,7 @@ class Sbml(CMakePackage): "-DWITH_XERCES:BOOL=OFF", "-DWITH_ZLIB:BOOL=ON", ] + args.append(self.define_from_variant('WITH_CPP_NAMESPACE', 'cpp')) if '+python' in spec: args.extend([ "-DWITH_PYTHON:BOOL=ON", diff --git a/var/spack/repos/builtin/packages/wcs/package.py b/var/spack/repos/builtin/packages/wcs/package.py new file mode 100644 index 0000000000..44a39cccbe --- /dev/null +++ b/var/spack/repos/builtin/packages/wcs/package.py @@ -0,0 +1,33 @@ +# Copyright 2013-2020 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack import * + + +class Wcs(CMakePackage): + """Simulates whole cell models using discrete event simulation.""" + + homepage = "https://github.com/LLNL/wcs.git" + git = "https://github.com/LLNL/wcs.git" + maintainers = ['rblake-llnl'] + + version('master', branch='master') + version('develop', branch='devel') + + depends_on('boost+graph+filesystem+regex+system') + depends_on('sbml@5.18.0:+cpp') + depends_on('cmake@3.12:', type='build') + depends_on('cereal', type='build') + + def cmake_args(self): + spec = self.spec + args = [ + "-DBOOST_ROOT:PATH=" + spec['boost'].prefix, + "-DCEREAL_ROOT:PATH=" + spec['cereal'].prefix, + "-DSBML_ROOT:PATH=" + spec['sbml'].prefix, + "-DWCS_WITH_SBML:BOOL=ON", + "-DWCS_WITH_EXPRTK:BOOL=ON", + ] + return args |