JCF: Issue #129: ensure daq-cmake is only a dependency of dunedaq whe…

…n we're dealing with a developer installation
DUNE-DAQ · May 9, 2022 · 96bd53c · 96bd53c
1 parent 36dd330
commit 96bd53c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 47 deletions.
diff --git a/scripts/spack/make-release-repo.py b/scripts/spack/make-release-repo.py
@@ -184,7 +184,11 @@ def generate_umbrella_package(self, repo_path, template_dir):
                 else:
                     if not self.rdict["release"].startswith("dunedaq"):
                         iver = self.rdict["release"]
-                    lines += f'\n        depends_on(f"{iname}@{iver} build_type={{build_type}}", when=f"build_type={{build_type}}")'
+
+                    if iname == "daq-cmake":
+                        lines += f'\n        depends_on(f"{iname}@{iver} build_type={{build_type}}", when=f"build_type={{build_type}} +dev")'
+                    else:
+                        lines += f'\n        depends_on(f"{iname}@{iver} build_type={{build_type}}", when=f"build_type={{build_type}}")'
 
             lines += '\n'
             ipkg_dir = os.path.join(repo_dir, ipkg)

diff --git a/spack-repos/release-repo-template/packages/appfwk/#package.py# b/spack-repos/release-repo-template/packages/appfwk/#package.py#