Skip to content

Commit

Permalink
removed build of omsi cpp wrapper library because omsicpp codegen is …
Browse files Browse the repository at this point in the history
…skipped
  • Loading branch information
niklwors authored and adrpo committed May 12, 2020
1 parent 48660fd commit 1ed7416
Showing 1 changed file with 14 additions and 11 deletions.
25 changes: 14 additions & 11 deletions OMCompiler/SimulationRuntime/OMSICpp/omsi/CMakeLists.txt
Expand Up @@ -10,16 +10,17 @@ include_directories ("${CMAKE_SOURCE_DIR}/../../3rdParty/FMIL/ThirdParty/FMI/def

MESSAGE(STATUS "OMSI Library:")
MESSAGE(STATUS "${OMSIBASE_LIB}")
#Removed this library because the omsicpp code generation is skipped at the moment which used this library

add_library(${OSUName} STATIC src/fmi2/omsi_fmi2_me.cpp src/fmi2/detail/omsi_fmi2_log.cpp src/fmi2/detail/omsi_fmi2_wrapper.cpp src/omsi_factory.cpp src/omsi_global_settings.cpp )
IF(WIN32)
target_link_libraries(${OSUName} ${OMCFactoryName} ${SimControllerName} ${ExtensionUtilitiesName} ${ModelicaUtilitiesName} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS} wsock32 ws2_32)
ELSE(WIN32)
target_link_libraries(${OSUName} ${OMCFactoryName} ${SimControllerName} ${ExtensionUtilitiesName} ${ModelicaUtilitiesName} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS})
ENDIF(WIN32)
#add_library(${OSUName} STATIC src/fmi2/omsi_fmi2_me.cpp src/fmi2/detail/omsi_fmi2_log.cpp src/fmi2/detail/omsi_fmi2_wrapper.cpp src/omsi_factory.cpp src/omsi_global_settings.cpp )
#IF(WIN32)
#target_link_libraries(${OSUName} ${OMCFactoryName} ${SimControllerName} ${ExtensionUtilitiesName} ${ModelicaUtilitiesName} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS} wsock32 ws2_32)
#ELSE(WIN32)
#target_link_libraries(${OSUName} ${OMCFactoryName} ${SimControllerName} ${ExtensionUtilitiesName} ${ModelicaUtilitiesName} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS})
#ENDIF(WIN32)


install(TARGETS ${OSUName} DESTINATION ${LIBINSTALLEXT})
#install(TARGETS ${OSUName} DESTINATION ${LIBINSTALLEXT})


IF(BUILD_SHARED_LIBS)
Expand All @@ -33,13 +34,15 @@ IF(BUILD_SHARED_LIBS)

IF(WIN32)
target_link_libraries(${OSUSimName} ${OMCFactoryName} ${ExtensionUtilitiesName} ${ModelicaUtilitiesName} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS} wsock32 ws2_32)
target_link_libraries(${OSUName} ${OMCFactoryName} ${SimControllerName} ${ExtensionUtilitiesName} ${ModelicaUtilitiesName} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS} wsock32 ws2_32)
#Removed this library because the omsicpp code generation is skipped at the moment which used this library
#target_link_libraries(${OSUName} ${OMCFactoryName} ${SimControllerName} ${ExtensionUtilitiesName} ${ModelicaUtilitiesName} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS} wsock32 ws2_32)
ELSE(WIN32)
target_link_libraries(${OSUSimName} ${OMCFactoryName} ${ExtensionUtilitiesName} ${ModelicaUtilitiesName} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS})
target_link_libraries(${OSUName} ${OMCFactoryName} ${SimControllerName} ${ExtensionUtilitiesName} ${ModelicaUtilitiesName} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS} )
#Removed this library because the omsicpp code generation is skipped at the moment which used this library
#target_link_libraries(${OSUName} ${OMCFactoryName} ${SimControllerName} ${ExtensionUtilitiesName} ${ModelicaUtilitiesName} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS} )
ENDIF(WIN32)

set_target_properties(${OSUName} PROPERTIES COMPILE_DEFINITIONS "RUNTIME_STATIC_LINKING;ENABLE_SUNDIALS_STATIC")
#Removed this library because the omsicpp code generation is skipped at the moment which used this library
#set_target_properties(${OSUName} PROPERTIES COMPILE_DEFINITIONS "RUNTIME_STATIC_LINKING;ENABLE_SUNDIALS_STATIC")

IF(MSVC)
install(FILES $<TARGET_PDB_FILE:${OSUSimName}> DESTINATION bin OPTIONAL)
Expand Down

0 comments on commit 1ed7416

Please sign in to comment.