Rename OMSimulator.mo to OMSimulatorExt.mo (#8404)

- Rename OMSimulator.mo to OMSimulatorExt.mo - This is to avoid conflicting includes between the generated OMSimulator.h (from OMSimulator.mo) and the OMSimulator.h from OMSimulator itself (the public header of OMSimulator) - Remove workaround added for the conflicting headers.
OpenModelica · Jan 12, 2022 · 284d729 · 284d729
1 parent 06f963d
commit 284d729
Show file tree

Hide file tree

Showing 5 changed files with 84 additions and 96 deletions.
diff --git a/OMCompiler/Compiler/.cmake/meta_modelica_source_list.cmake b/OMCompiler/Compiler/.cmake/meta_modelica_source_list.cmake
@@ -449,7 +449,7 @@ set(OMC_MM_BACKEND_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/Util/HashTableCrToCrEqLst.mo
     ${CMAKE_CURRENT_SOURCE_DIR}/Util/HashTableSimCodeEqCache.mo
     ${CMAKE_CURRENT_SOURCE_DIR}/Util/HashTableSM1.mo
-    ${CMAKE_CURRENT_SOURCE_DIR}/Util/OMSimulator.mo
+    ${CMAKE_CURRENT_SOURCE_DIR}/Util/OMSimulatorExt.mo
     ${CMAKE_CURRENT_SOURCE_DIR}/Util/PriorityQueue.mo
     ${CMAKE_CURRENT_SOURCE_DIR}/Util/SBAtomicSet.mo
     ${CMAKE_CURRENT_SOURCE_DIR}/Util/SBFunctions.mo