Aufgrund einer Störung des s3 Storage, könnten in nächster Zeit folgende GitLab Funktionen nicht zur Verfügung stehen: LFS, Container Registry, Job Artifacs, Uploads (Wiki, Bilder, Projekt-Exporte). Wir bitten um Verständnis. Es wird mit Hochdruck an der Behebung des Problems gearbeitet. Weitere Informationen zur Störung des Object Storage finden Sie hier: https://maintenance.itc.rwth-aachen.de/ticket/status/messages/59-object-storage-pilot

Commit 269ee9d0 authored by Malte Heithoff's avatar Malte Heithoff
Browse files

merge cmakeconfig

parent 0c49bd9c
......@@ -885,28 +885,23 @@ public class EMADLGenerator implements EMAMGenerator {
}
private void mergeCMakeConfigs() {
List<String> cmakeCommandList = emamGen.getCMakeConfig().getCMakeListsViewModel().getCmakeCommandList();
List<String> cmakeCommandListEnd = emamGen.getCMakeConfig().getCMakeListsViewModel().getCmakeCommandListEnd();
List<String> cmakeLibraryLinkageList = emamGen.getCMakeConfig().getCMakeListsViewModel().getCmakeLibraryLinkageList();
LinkedHashSet<CMakeFindModule> moduleDependencies = emamGen.getCMakeConfig().getCMakeListsViewModel().getModuleDependencies();
// merge
emamGen.getCmakeConfig().getCMakeListsViewModel().getCmakeCommandList()
.stream().forEach(s -> cMakeConfig.addCMakeCommand(s));
emamGen.getCmakeConfig().getCMakeListsViewModel().getCmakeCommandListEnd()
.stream().forEach(s -> cMakeConfig.addCMakeCommandEnd(s));
emamGen.getCmakeConfig().getCMakeListsViewModel().getCmakeLibraryLinkageList()
.stream().forEach(s -> cMakeConfig.addCmakeLibraryLinkage(s));
emamGen.getCmakeConfig().getCMakeListsViewModel().getModuleDependencies()
.stream().forEach(s -> cMakeConfig.addModuleDependency(s));
cnnArchGenerator.getCmakeConfig().getCMakeListsViewModel().getCmakeCommandList()
.stream().filter(s -> !cmakeCommandList.contains(s))
.forEach(s -> cmakeCommandList.add(s));
.stream().forEach(s -> cMakeConfig.addCMakeCommand(s));
cnnArchGenerator.getCmakeConfig().getCMakeListsViewModel().getCmakeCommandListEnd()
.stream().filter(s -> !cmakeCommandListEnd.contains(s))
.forEach(s -> cmakeCommandListEnd.add(s));
.stream().forEach(s -> cMakeConfig.addCMakeCommandEnd(s));
cnnArchGenerator.getCmakeConfig().getCMakeListsViewModel().getCmakeLibraryLinkageList()
.stream().filter(s -> !cmakeLibraryLinkageList.contains(s))
.forEach(s -> cmakeLibraryLinkageList.add(s));
.stream().forEach(s -> cMakeConfig.addCmakeLibraryLinkage(s));
cnnArchGenerator.getCmakeConfig().getCMakeListsViewModel().getModuleDependencies()
.stream().filter(s -> !moduleDependencies.contains(s))
.forEach(s -> moduleDependencies.add(s));
cMakeConfig.getCMakeListsViewModel().setCmakeCommandList(cmakeCommandList);
cMakeConfig.getCMakeListsViewModel().setCmakeCommandListEnd(cmakeCommandListEnd);
cMakeConfig.getCMakeListsViewModel().setCmakeLibraryLinkageList(cmakeLibraryLinkageList);
cMakeConfig.getCMakeListsViewModel().setModuleDependencies(moduleDependencies);
.stream().forEach(s -> cMakeConfig.addModuleDependency(s));
}
@Override
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment