Skip to content

Commit

Permalink
fix for linker error in ModelicaExtrenalC for cpp runtime
Browse files Browse the repository at this point in the history
Belonging to [master]:
  - OpenModelica/OMCompiler#2046
  • Loading branch information
niklwors authored and OpenModelica-Hudson committed Nov 22, 2017
1 parent 814b4ae commit d9b2126
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion SimulationRuntime/cpp/Core/ModelicaExternalC/CMakeLists.txt
Expand Up @@ -2,13 +2,19 @@ cmake_minimum_required(VERSION 2.8.9)

project(${ModelicaExternalName})

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

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 ) #


#if(MSVC)
# set_property(TARGET ${ModelicaExternalName} APPEND PROPERTY COMPILE_FLAGS /Zc:inline )
# set_property(TARGET ${ModelicaExternalName} APPEND PROPERTY LINK_FLAGS /OPT:NOREF)
#endif()

add_definitions(-DDUMMY_FUNCTION_USERTAB)
include_directories(${MODELICAEXTERNALCDIR})
# include_directories (${USERTABDIR})
Expand Down

0 comments on commit d9b2126

Please sign in to comment.