Fix for clang OpenMP flags not working with g++

OpenModelica · Oct 26, 2016 · 150de49 · 150de49
1 parent 3b40628
commit 150de49
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 7 deletions.
diff --git a/openmodelica/cppruntime/libraries/msl32/ModelTestingDefaults.mos b/openmodelica/cppruntime/libraries/msl32/ModelTestingDefaults.mos
@@ -1,3 +1,4 @@
 runScript(getEnvironmentVar("OMLIBRARYCOMMON")+"/ModelTestingDefaults.mos");
 simulationRuntime := OpenModelicaModelTesting.SimulationRuntime.Cpp;
-setCXXCompiler(if regexBool(getCXXCompiler(),"clang++") then "g++" else getCXXCompiler());
+// Cannot change to g++ -fopenmp=libiomp5 just like that
+// setCXXCompiler(if regexBool(getCXXCompiler(),"clang++") then "g++" else getCXXCompiler());
diff --git a/...odelica/cppruntime/libraries/msl32/Modelica.Electrical.Analog.Examples.CauerLowPassSC.mos b/...odelica/cppruntime/libraries/msl32/Modelica.Electrical.Analog.Examples.CauerLowPassSC.mos
@@ -39,7 +39,6 @@ runScript(modelTesting);getErrorString();
 // "\"true
 // \"
 // OpenModelicaModelTesting.SimulationRuntime.Cpp
-// true
 // "
 // ""
 // OpenModelicaModelTesting.SimulationRuntime.Cpp

diff --git a/openmodelica/cppruntime/libraries/msl32/Modelica.Electrical.Digital.Examples.Counter.mos b/openmodelica/cppruntime/libraries/msl32/Modelica.Electrical.Digital.Examples.Counter.mos
@@ -20,7 +20,6 @@ runScript(modelTesting);getErrorString();
 // "\"true
 // \"
 // OpenModelicaModelTesting.SimulationRuntime.Cpp
-// true
 // "
 // ""
 // OpenModelicaModelTesting.SimulationRuntime.Cpp

diff --git a/...ntime/libraries/msl32/Modelica.Mechanics.MultiBody.Examples.Elementary.DoublePendulum.mos b/...ntime/libraries/msl32/Modelica.Mechanics.MultiBody.Examples.Elementary.DoublePendulum.mos
@@ -20,7 +20,6 @@ getErrorString();
 // "\"true
 // \"
 // OpenModelicaModelTesting.SimulationRuntime.Cpp
-// true
 // "
 // OpenModelicaModelTesting.Kind.VerifiedSimulation
 // Modelica.Mechanics.MultiBody.Examples.Elementary.DoublePendulum

diff --git a/...braries/msl32/Modelica.Mechanics.MultiBody.Examples.Elementary.RollingWheelSetDriving.mos b/...braries/msl32/Modelica.Mechanics.MultiBody.Examples.Elementary.RollingWheelSetDriving.mos
@@ -20,7 +20,6 @@ getErrorString();
 // "\"true
 // \"
 // OpenModelicaModelTesting.SimulationRuntime.Cpp
-// true
 // "
 // OpenModelicaModelTesting.Kind.VerifiedSimulation
 // Modelica.Mechanics.MultiBody.Examples.Elementary.RollingWheelSetDriving

diff --git a/...ntime/libraries/msl32/Modelica.Mechanics.MultiBody.Examples.Elementary.SpringWithMass.mos b/...ntime/libraries/msl32/Modelica.Mechanics.MultiBody.Examples.Elementary.SpringWithMass.mos
@@ -20,7 +20,6 @@ getErrorString();
 // "\"true
 // \"
 // OpenModelicaModelTesting.SimulationRuntime.Cpp
-// true
 // "
 // OpenModelicaModelTesting.Kind.VerifiedSimulation
 // Modelica.Mechanics.MultiBody.Examples.Elementary.SpringWithMass

diff --git a/...ppruntime/libraries/msl32/Modelica.Mechanics.Translational.Examples.InitialConditions.mos b/...ppruntime/libraries/msl32/Modelica.Mechanics.Translational.Examples.InitialConditions.mos
@@ -38,7 +38,6 @@ runScript(modelTesting);getErrorString();
 // "\"true
 // \"
 // OpenModelicaModelTesting.SimulationRuntime.Cpp
-// true
 // "
 // ""
 // OpenModelicaModelTesting.Kind.VerifiedSimulation