Changeset c251417 in OpenModelica

Timestamp:

2020-10-21T14:04:15+02:00 (4 years ago)

Author:

Mahder Gebremedhin <mahder.gebremedhin@…>

Children:

0476685a

Parents:

bca8c1e

git-author:

Mahder Gebremedhin <mahder.gebremedhin@…> (07/12/20 20:34:30)

git-committer:

Mahder Gebremedhin <mahder.gebremedhin@…> (10/21/20 14:04:15)

Message:

[cmake] Add runtime/omcbackendruntime compilation.

Location:

OMCompiler/Compiler/runtime

Files:

• BackendDAEEXT_omc.cpp (modified) (1 diff)
• CMakeLists.txt (modified) (2 diffs)
• Dynload.cpp (modified) (1 diff)
• Dynload_omc.cpp (modified) (1 diff)
• FMIImpl.c (modified) (1 diff)
• FMI_omc.c (modified) (1 diff)
• HpcOmBenchmarkExt_omc.cpp (modified) (1 diff)
• HpcOmSchedulerExt_omc.cpp (modified) (1 diff)
• TaskGraphResults_omc.cpp (modified) (1 diff)
• matching_cheap.c (modified) (1 diff)

OMCompiler/Compiler/runtime/BackendDAEEXT_omc.cpp

@@ -41 +41 @@
  */
 
-#include "meta_modelica.h"
+#include "meta/meta_modelica.h"
 #include "BackendDAEEXT.cpp"
 #include <stdlib.h>

OMCompiler/Compiler/runtime/CMakeLists.txt

@@ -3 +3 @@
 find_package(Intl REQUIRED)
 find_package(Iconv REQUIRED)
-# find_package(ZLIB REQUIRED)
+# find_package(ZLIB REQUIRED) # We use the minizip lib from 3rdParty/FMIL
 
 set(OMC_RUNTIIME_SOURCES Error_omc.cpp Print_omc.c ErrorMessage.cpp
@@ -34 +34 @@
 
 target_include_directories(omcruntime PRIVATE ${OMCompiler_SOURCE_DIR}/Compiler) #for OpenModelicaBootstrappingHeader.h :/
+
+
+
+
+
+set(OMC_BACKENDRUNTIIME_SOURCES HpcOmSchedulerExt_omc.cpp HpcOmBenchmarkExt_omc.cpp
+                                TaskGraphResults_omc.cpp BackendDAEEXT_omc.cpp
+                                matching.c matching_cheap.c Dynload_omc.cpp FMI_omc.c cJSON.c
+                            )
+add_library(omcbackendruntime STATIC ${OMC_BACKENDRUNTIIME_SOURCES})
+add_library(omc::compiler::backendruntime ALIAS omcbackendruntime)
+# target_compile_features(omcbackendruntime PRIVATE cxx_std_11)
+
+target_link_libraries(omcbackendruntime PUBLIC OpenModelicaRuntimeC)
+target_link_libraries(omcbackendruntime PUBLIC omc::3rd::fmilib::shared) # We use the minizip lib from 3rdParty/FMIL
+target_link_libraries(omcbackendruntime PUBLIC omc::3rd::gc)
+
+
+target_include_directories(omcbackendruntime PRIVATE ${SimulationRuntimeC_SOURCE_DIR}) #for openmodelica.h :/
+target_include_directories(omcbackendruntime PRIVATE ${OMCompiler_SOURCE_DIR}) #for revision.h
+target_include_directories(omcbackendruntime PRIVATE ${OMCompiler_SOURCE_DIR}/Compiler) #for OpenModelicaBootstrappingHeader.h :/
+

OMCompiler/Compiler/runtime/Dynload.cpp

@@ -42 +42 @@
 #include "systemimpl.h"
 #include "errorext.h"
-#include "meta_modelica_builtin.h"
+#include "meta/meta_modelica_builtin.h"
 
 #define MMC_NUM_ARGS 32

OMCompiler/Compiler/runtime/Dynload_omc.cpp

@@ -38 +38 @@
 
 #include "openmodelica.h"
-#include "meta_modelica.h"
+#include "meta/meta_modelica.h"
 #define ADD_METARECORD_DEFINITIONS static
 #include "OpenModelicaBootstrappingHeader.h"

OMCompiler/Compiler/runtime/FMIImpl.c

@@ -59 +59 @@
 #include "systemimpl.h"
 #include "errorext.h"
-#include "modelica_string.h"
+#include "util/modelica_string.h"
 
 #define FMILIB_BUILDING_LIBRARY

OMCompiler/Compiler/runtime/FMI_omc.c

@@ -29 +29 @@
  */
 
-#include "meta_modelica.h"
+#include "meta/meta_modelica.h"
 #define ADD_METARECORD_DEFINITIONS static
 #include "OpenModelicaBootstrappingHeader.h"

OMCompiler/Compiler/runtime/HpcOmBenchmarkExt_omc.cpp

@@ -1 +1 @@
 #include "openmodelica.h"
-#include "meta_modelica.h"
+#include "meta/meta_modelica.h"
 #define ADD_METARECORD_DEFINITIONS static
 #include "OpenModelicaBootstrappingHeader.h"

OMCompiler/Compiler/runtime/HpcOmSchedulerExt_omc.cpp

@@ -1 +1 @@
 #include "openmodelica.h"
-#include "meta_modelica.h"
+#include "meta/meta_modelica.h"
 #define ADD_METARECORD_DEFINITIONS static
 #include "OpenModelicaBootstrappingHeader.h"

OMCompiler/Compiler/runtime/TaskGraphResults_omc.cpp

@@ -2 +2 @@
 extern "C" {
 #include "openmodelica.h"
-#include "meta_modelica.h"
+#include "meta/meta_modelica.h"
 #define ADD_METARECORD_DEFINITIONS static
 #include "OpenModelicaBootstrappingHeader.h"

OMCompiler/Compiler/runtime/matching_cheap.c

@@ -22 +22 @@
 #include <stdlib.h>
 #include <ctype.h>
-#include <tinymt64.h>
+#include "util/tinymt64.h"
 
 #include "matchmaker.h"