summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorLevi Baber <baberlevi@gmail.com>2018-07-09 13:21:38 -0500
committerAdam J. Stewart <ajstewart426@gmail.com>2018-07-09 13:21:38 -0500
commit25c9a5216f2b0b6452f8bbc2e501dcf1a6428305 (patch)
treec210673337f690e919c1164764056d81ff0dca21 /var
parentde4b6e6100a4101a0bce2734755b8ece2c79f165 (diff)
downloadspack-25c9a5216f2b0b6452f8bbc2e501dcf1a6428305.tar.gz
spack-25c9a5216f2b0b6452f8bbc2e501dcf1a6428305.tar.bz2
spack-25c9a5216f2b0b6452f8bbc2e501dcf1a6428305.tar.xz
spack-25c9a5216f2b0b6452f8bbc2e501dcf1a6428305.zip
express: bamtools lib handling (#8552)
* express: bamtools lib handling * express: use libs property * express: remove old comment
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/express/package.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/var/spack/repos/builtin/packages/express/package.py b/var/spack/repos/builtin/packages/express/package.py
index cfc83ec44c..6d792f5479 100644
--- a/var/spack/repos/builtin/packages/express/package.py
+++ b/var/spack/repos/builtin/packages/express/package.py
@@ -52,11 +52,8 @@ class Express(CMakePackage):
edit.filter('#include <api', '#include <%s' % self.spec[
'bamtools'].prefix.include.bamtools.api)
edit = FileFilter('CMakeLists.txt')
- # really ugly way to escape the $ in CMakeLists.txt
- edit.filter('{CMAKE_CURRENT_SOURCE_DIR}/../bamtools/lib/'
- 'libbamtools.a', '$')
- edit.filter('\\$\\$', '%s' % join_path(self.spec[
- 'bamtools'].prefix.lib.bamtools, 'libbamtools.a'))
+ edit.filter('\${CMAKE_CURRENT_SOURCE_DIR}/../bamtools/lib/'
+ 'libbamtools.a', '%s' % self.spec['bamtools'].libs)
def setup_environment(self, spack_env, run_env):
spack_env.prepend_path('CPATH', self.spec[