Skip to content
This repository was archived by the owner on May 18, 2019. It is now read-only.

Commit a4e794b

Browse files
AndreasOpenModelica-Hudson
authored andcommitted
Fix wrong linkage of expat lib for FMUs
Expat is used in OMSI FMUs and now installed to build/lib/<system-triple>/omc/omsi. Belonging to [master]: - #3083
1 parent d2540cc commit a4e794b

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

Compiler/Template/CodegenOMSIC.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ template createMakefile(SimCode simCode, String target, String makeflieName)
187187
INCLUDE_DIR_OMSIC_FMI2=$(OMHOME)/include/omc/omsic/fmi2
188188

189189
# Libraries
190-
EXPAT_LIBDIR=$(OMHOME)/../OMCompiler/3rdParty/FMIL/build/ExpatEx
190+
EXPAT_LIBDIR=$(OMLIB)/omc/omsi
191191
EXPAT_LIB=expat
192192

193193
LAPACK_LIBDIR=<%lapackDirWin%>

SimulationRuntime/OMSI/base/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ set(CMAKE_INSTALL_RPATH "${LIBINSTALLEXT}")
4040

4141
install(TARGETS ${OSUBaseName} DESTINATION ${LIBINSTALLEXT})
4242

43+
install(FILES ${CMAKE_SOURCE_DIR}/../../3rdParty/FMIL/build/ExpatEx/libexpat.a DESTINATION ${LIBINSTALLEXT})
44+
45+
4346
install(FILES
4447
${CMAKE_SOURCE_DIR}/base/include/omsi_event_helper.h
4548
${CMAKE_SOURCE_DIR}/base/include/omsi_getters_and_setters.h

0 commit comments

Comments
 (0)