Fix issue with NAMD patch not applying cleanly (#19675)
Co-authored-by: Scott McMillan <smcmillan@nvidia.com>
This commit is contained in:
parent
acc075d79d
commit
f621e97f47
2 changed files with 2 additions and 2 deletions
|
@ -35,8 +35,8 @@ class Namd(MakefilePackage):
|
||||||
# init_tcl_pointers() declaration and implementation are inconsistent
|
# init_tcl_pointers() declaration and implementation are inconsistent
|
||||||
# "src/colvarproxy_namd.C", line 482: error: inherited member is not
|
# "src/colvarproxy_namd.C", line 482: error: inherited member is not
|
||||||
# allowed
|
# allowed
|
||||||
patch('inherited-member.patch', when='@:2.13')
|
patch('inherited-member-2.13.patch', when='@2.13')
|
||||||
patch('inherited-member-2.14.patch', when='@2.14:')
|
patch('inherited-member-2.14.patch', when='@2.14')
|
||||||
|
|
||||||
depends_on('charmpp@6.10.1:', when="@2.14:")
|
depends_on('charmpp@6.10.1:', when="@2.14:")
|
||||||
depends_on('charmpp@6.8.2', when="@2.13")
|
depends_on('charmpp@6.8.2', when="@2.13")
|
||||||
|
|
Loading…
Reference in a new issue