access-generic-tracers: add use_access_fms variant

Author: dougiesquire

packages/access-generic-tracers/package.py

@@ -21,8 +21,11 @@ class AccessGenericTracers(CMakePackage):
     # TODO: Needs to be changed once changes to build system enter master.
     version("development", branch="development", preferred=True)
 
+    variant("use_access_fms", default=False, description="Use the access-fms Spack package")
+
     depends_on("access-mocsy")
-    depends_on("access-fms")
+    depends_on("access-fms", when="+use_access_fms")
+    depends_on("fms", when="~use_access_fms")
     depends_on("mpi")
 
     def url_for_version(self, version):

packages/mom5/package.py

@@ -73,11 +73,11 @@ class Mom5(CMakePackage, MakefilePackage):
     #       it has been renamed to "legacy-access-om2-bgc".
     with when("@access-om2,access-esm1.6"):
         depends_on("access-fms")
-        depends_on("access-generic-tracers")
+        depends_on("access-generic-tracers+use_access_fms")
 
     with when("@legacy-access-om2-bgc"):
         depends_on("access-fms", when="build_system=cmake")
-        depends_on("access-generic-tracers", when="build_system=cmake")
+        depends_on("access-generic-tracers+use_access_fms", when="build_system=cmake")
 
     with when("@access-esm1.5"):
         depends_on("netcdf-c@4.7.1:")