added ModelicaIO and zlib to cpp runtime build

OpenModelica · Oct 14, 2016 · d314f5c · d314f5c
1 parent 892dc5a
commit d314f5c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/SimulationRuntime/cpp/CMakeLists.txt b/SimulationRuntime/cpp/CMakeLists.txt
@@ -98,6 +98,9 @@ SET(OMCFactoryName ${LIBPREFIX}OMCFactory${LIBSUFFIX})
 SET(MathName ${LIBPREFIX}Math${LIBSUFFIX})
 SET(ModelicaExternalName ModelicaExternalC) # only static version
 SET(ModelicaTablesName ModelicaStandardTables) # only static version
+SET(LibZName zlib) # only static version
+SET(ModelicaMatIOName ModelicaMatIO) # only static version
+
 SET(SimulationSettings ${LIBPREFIX}SimulationSettings${LIBSUFFIX})
 SET(SimControllerName ${LIBPREFIX}SimController${LIBSUFFIX})
 SET(CVodeName ${LIBPREFIX}CVode${LIBSUFFIX})

diff --git a/SimulationRuntime/cpp/Core/ModelicaExternalC/CMakeLists.txt b/SimulationRuntime/cpp/Core/ModelicaExternalC/CMakeLists.txt
@@ -6,10 +6,15 @@ add_library(${ModelicaExternalName} STATIC ${MODELICAEXTERNALCDIR}/ModelicaStand
 
 add_library(${ModelicaTablesName} STATIC ${MODELICAEXTERNALCDIR}/ModelicaStandardTables.c ${MODELICAEXTERNALCDIR}/ModelicaMatIO.c) #  ${USERTABDIR}/usertab.c
 
+add_library(${ModelicaMatIOName} STATIC ${MODELICAEXTERNALCDIR}/ModelicaIO.c ) #
+add_library(${LibZName} STATIC ${MODELICAEXTERNALCDIR}/zlib/adler32.c ${MODELICAEXTERNALCDIR}/zlib/compress.c ${MODELICAEXTERNALCDIR}/zlib/crc32.c ${MODELICAEXTERNALCDIR}/zlib/deflate.c ${MODELICAEXTERNALCDIR}/zlib/gzclose.c ${MODELICAEXTERNALCDIR}/zlib/gzlib.c ${MODELICAEXTERNALCDIR}/zlib/gzread.c ${MODELICAEXTERNALCDIR}/zlib/gzwrite.c ${MODELICAEXTERNALCDIR}/zlib/infback.c ${MODELICAEXTERNALCDIR}/zlib/inffast.c ${MODELICAEXTERNALCDIR}/zlib/inflate.c ${MODELICAEXTERNALCDIR}/zlib/inftrees.c ${MODELICAEXTERNALCDIR}/zlib/trees.c ${MODELICAEXTERNALCDIR}/zlib/uncompr.c ${MODELICAEXTERNALCDIR}/zlib/zutil.c ) #
+
 add_definitions(-DDUMMY_FUNCTION_USERTAB)
 include_directories(${MODELICAEXTERNALCDIR})
 # include_directories (${USERTABDIR})
 
 install(TARGETS ${ModelicaExternalName} DESTINATION ${LIBINSTALLEXT})
 install(TARGETS ${ModelicaTablesName} DESTINATION ${LIBINSTALLEXT})
+install(TARGETS ${ModelicaMatIOName} DESTINATION ${LIBINSTALLEXT})
+install(TARGETS ${LibZName} DESTINATION ${LIBINSTALLEXT})
 #lib/omc/cpp