add missing CMake build dependency for MUSCLE3 + clean up & enhance s…

…anity check
SimonPinches · Oct 23, 2023 · 10934e1 · 10934e1
1 parent dc53e96
commit 10934e1
Showing 1 changed file with 15 additions and 21 deletions.
diff --git a/easybuild/easyconfigs/m/MUSCLE3/MUSCLE3-0.7.0-foss-2022b.eb b/easybuild/easyconfigs/m/MUSCLE3/MUSCLE3-0.7.0-foss-2022b.eb
@@ -18,6 +18,7 @@ sources = ['%(version)s.tar.gz']
 checksums = ['e2ab6f0d219845c7bcdf9ebade9572b647d5dc464179b4714211db68fd9cb062']
 
 builddependencies = [
+    ('CMake', '3.24.3'),
     ('googletest', '1.12.1'),
 ]
 
@@ -77,27 +78,20 @@ modextrapaths = {
 }
 
 sanity_check_paths = {
-    'files': ['include/libmuscle.f90',
-              'include/libmuscle.mod',
-              'include/libmuscle/libmuscle.hpp',
-              'include/ymmsl/ymmsl.hpp',
-              'lib/libmuscle.a',
-              'lib/libmuscle.%s' % SHLIB_EXT,
-              'lib/libmuscle_fortran.a',
-              'lib/libmuscle_fortran.%s' % SHLIB_EXT,
-              'lib/libymmsl.a',
-              'lib/libymmsl.%s' % SHLIB_EXT,
-              'lib/libymmsl_fortran.a',
-              'lib/libymmsl_fortran.%s' % SHLIB_EXT,
-              'lib/pkgconfig/libmuscle.pc',
-              'lib/pkgconfig/libmuscle_fortran.pc',
-              'lib/pkgconfig/ymmsl.pc',
-              'lib/pkgconfig/ymmsl_fortran.pc'],
-    'dirs':  ['bin',
-              'include/libmuscle/mcp',
-              'include/ymmsl',
-              'lib/pkgconfig',
-              'lib64']
+    'files': ['bin/muscle3', 'bin/muscle3.env', 'bin/muscle_manager',
+              'include/libmuscle.f90', 'include/libmuscle.mod', 'include/libmuscle/libmuscle.hpp',
+              'include/ymmsl/ymmsl.hpp', 'lib/libmuscle.a', 'lib/libmuscle.%s' % SHLIB_EXT,
+              'lib/libmuscle_fortran.a', 'lib/libmuscle_fortran.%s' % SHLIB_EXT,
+              'lib/libymmsl.a', 'lib/libymmsl.%s' % SHLIB_EXT,
+              'lib/libymmsl_fortran.a', 'lib/libymmsl_fortran.%s' % SHLIB_EXT,
+              'lib/pkgconfig/libmuscle.pc', 'lib/pkgconfig/libmuscle_fortran.pc',
+              'lib/pkgconfig/ymmsl.pc', 'lib/pkgconfig/ymmsl_fortran.pc'],
+    'dirs':  [],
 }
 
+sanity_check_commands = [
+    "muscle3 --help",
+    "muscle_manager --help",
+]
+
 moduleclass = 'tools'