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

Commit d9b2126

Browse files
niklworsOpenModelica-Hudson
authored andcommitted
fix for linker error in ModelicaExtrenalC for cpp runtime
Belonging to [master]: - #2046
1 parent 814b4ae commit d9b2126

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

SimulationRuntime/cpp/Core/ModelicaExternalC/CMakeLists.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,19 @@ cmake_minimum_required(VERSION 2.8.9)
22

33
project(${ModelicaExternalName})
44

5-
add_library(${ModelicaExternalName} STATIC ${MODELICAEXTERNALCDIR}/ModelicaStandardTables.c ${MODELICAEXTERNALCDIR}/ModelicaMatIO.c ${MODELICAEXTERNALCDIR}/ModelicaInternal.c ${MODELICAEXTERNALCDIR}/ModelicaStrings.c ${MODELICAEXTERNALCDIR}/ModelicaRandom.c) # ${USERTABDIR}/usertab.c
5+
add_library(${ModelicaExternalName} STATIC ${MODELICAEXTERNALCDIR}/ModelicaFFT.c ${MODELICAEXTERNALCDIR}/ModelicaInternal.c ${MODELICAEXTERNALCDIR}/ModelicaRandom.c ${MODELICAEXTERNALCDIR}/ModelicaStrings.c) # ${USERTABDIR}/usertab.c
66

77
add_library(${ModelicaTablesName} STATIC ${MODELICAEXTERNALCDIR}/ModelicaStandardTables.c ${MODELICAEXTERNALCDIR}/ModelicaMatIO.c) # ${USERTABDIR}/usertab.c
88

99
add_library(${ModelicaMatIOName} STATIC ${MODELICAEXTERNALCDIR}/ModelicaIO.c ) #
1010
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 ) #
1111

12+
13+
#if(MSVC)
14+
# set_property(TARGET ${ModelicaExternalName} APPEND PROPERTY COMPILE_FLAGS /Zc:inline )
15+
# set_property(TARGET ${ModelicaExternalName} APPEND PROPERTY LINK_FLAGS /OPT:NOREF)
16+
#endif()
17+
1218
add_definitions(-DDUMMY_FUNCTION_USERTAB)
1319
include_directories(${MODELICAEXTERNALCDIR})
1420
# include_directories (${USERTABDIR})

0 commit comments

Comments
 (0)