- update CMakefiles

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@10987 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Jan 30, 2012 · c7de83f · c7de83f
1 parent 10df253
commit c7de83f
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 23 deletions.
diff --git a/SimulationRuntime/c/CMakeLists.txt b/SimulationRuntime/c/CMakeLists.txt
@@ -18,6 +18,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/linearization)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/math-support)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/meta)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/meta/gc)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/ModelicaExternalC)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/simulation)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/simulation/libf2c)
@@ -67,6 +68,7 @@ MACRO(BUILDMODEL model mo dir Flags CSRC)
   INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/linearization)
   INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/math-support)
   INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/meta)
+  INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/meta/gc)
   INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/ModelicaExternalC)
   INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation)
   INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation/libf2c)
@@ -121,6 +123,7 @@ MACRO(BUILDMODELMOS model mos dir Flags CSRC)
   INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/linearization)
   INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/math-support)
   INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/meta)
+  INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/meta/gc)
   INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/ModelicaExternalC)
   INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation)
   INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation/libf2c)
@@ -197,12 +200,14 @@ MACRO(BUILDMODELFMU model dir Flags CSRC)
   INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/linearization)
   INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/math-support)
   INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/meta)
+  INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/meta/gc)
   INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/ModelicaExternalC)
   INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation)
   INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation/libf2c)
   INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation/results)
   INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation/solver)
   INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/util) 
+  INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/fmi/export) 
 
   # OMDEV PATH
   IF(NOT OMDEV)
@@ -260,12 +265,14 @@ MACRO(BUILDMODELFMUMOS model mos Flags CSRC)
   INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/linearization)
   INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/math-support)
   INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/meta)
+  INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/meta/gc)
   INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/ModelicaExternalC)
   INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation)
   INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation/libf2c)
   INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation/results)
   INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation/solver)
   INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/util)
+  INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/fmi/export) 
 
   # OMDEV PATH
   IF(NOT OMDEV)

diff --git a/SimulationRuntime/c/meta/CMakeLists.txt b/SimulationRuntime/c/meta/CMakeLists.txt
@@ -1,30 +1,27 @@
 # Sources and Headers
-SET(META_SRC 	meta_modelica.c
-				meta_modelica_builtin.c
+SET(META_SRC 	meta_modelica_builtin.c
+				meta_modelica_string_lit.c
+				realString.c
 				meta_modelica_catch.c
-				meta_modelica_gc.c
-				meta_modelica_gc_list.c
-				meta_modelica_gc_pages.c
-				meta_modelica_gc_roots.c
-				meta_modelica_gc_settings.c
-				meta_modelica_gc_stack.c
-				meta_modelica_gc_stats.c
+				meta_modelica.c
 				meta_modelica_real.c
-				meta_modelica_string_lit.c)
+				gc/gc.c
+				gc/common.c
+				gc/roots.c
+				gc/generational.c
+				gc/marksweep.c)
 
-SET(META_HFILES meta_modelica.h
-				meta_modelica_builtin.h
-				meta_modelica_builtin_boxptr.h
-				meta_modelica_gc.h
-				meta_modelica_gc_list.h
-				meta_modelica_gc_pages.h
-				meta_modelica_gc_roots.h
-				meta_modelica_gc_settings.h
-				meta_modelica_gc_stack.h
-				meta_modelica_gc_stats.h
-				meta_modelica_real.h
-				meta_modelica_string_lit.h
-                rml_compatibility.h) 
+SET(META_HFILES rml_compatibility.h 
+                meta_modelica_builtin.h 
+				meta_modelica_builtin_boxptr.h 
+				meta_modelica_real.h 
+				meta_modelica_string_lit.h 
+				meta_modelica.h 
+				gc/gc.h 
+				gc/common.h 
+				gc/generational.h 
+				gc/marksweep.h 
+				gc/roots.h) 
 
 
 # Library meta