Commit 6b81b081 authored by Carlos Alfredo Yeverino Rodriguez's avatar Carlos Alfredo Yeverino Rodriguez
Browse files

bugfix for the correct order of the cmake generation since HashSet does not...

bugfix for the correct order of the cmake generation since HashSet does not guarantee the constant order of elements over time.
parent be5f5860
Pipeline #106833 passed with stages
in 43 minutes and 30 seconds
......@@ -30,7 +30,7 @@
<groupId>de.monticore.lang.monticar</groupId>
<artifactId>embedded-montiarc-math-generator</artifactId>
<version>0.1.5-SNAPSHOT</version>
<version>0.1.6-SNAPSHOT</version>
<!-- == PROJECT DEPENDENCIES ============================================= -->
......
......@@ -32,7 +32,7 @@ import freemarker.template.TemplateExceptionHandler;
import java.io.IOException;
import java.io.StringWriter;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
......@@ -69,7 +69,7 @@ public class CMakeConfig {
private CMakeListsCPPViewModel cMakeListsViewModel = new CMakeListsCPPViewModel();
private HashSet<CMakeFindModule> moduleList = new HashSet<>();
private LinkedHashSet<CMakeFindModule> moduleList = new LinkedHashSet<>();
private List<String> cmakeCommandList = new ArrayList<>();
......
......@@ -23,7 +23,7 @@ package de.monticore.lang.monticar.generator.cmake;
import de.monticore.lang.monticar.generator.cpp.viewmodel.ViewModelBase;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
/**
......@@ -39,7 +39,7 @@ public class CMakeListsCPPViewModel extends ViewModelBase {
// fields
private String compName;
private HashSet<CMakeFindModule> moduleDependencies;
private LinkedHashSet<CMakeFindModule> moduleDependencies;
private List<String> cmakeCommandList = new ArrayList<>();
......@@ -55,11 +55,11 @@ public class CMakeListsCPPViewModel extends ViewModelBase {
this.compName = compName;
}
public HashSet<CMakeFindModule> getModuleDependencies() {
public LinkedHashSet<CMakeFindModule> getModuleDependencies() {
return moduleDependencies;
}
public void setModuleDependencies(HashSet<CMakeFindModule> moduleDependencies) {
public void setModuleDependencies(LinkedHashSet<CMakeFindModule> moduleDependencies) {
this.moduleDependencies = moduleDependencies;
}
......
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