Skip to content

Commit 1ed7416

Browse files
niklworsadrpo
authored andcommitted
removed build of omsi cpp wrapper library because omsicpp codegen is skipped
1 parent 48660fd commit 1ed7416

File tree

1 file changed

+14
-11
lines changed

1 file changed

+14
-11
lines changed

OMCompiler/SimulationRuntime/OMSICpp/omsi/CMakeLists.txt

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,17 @@ include_directories ("${CMAKE_SOURCE_DIR}/../../3rdParty/FMIL/ThirdParty/FMI/def
1010

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

14-
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 )
15-
IF(WIN32)
16-
target_link_libraries(${OSUName} ${OMCFactoryName} ${SimControllerName} ${ExtensionUtilitiesName} ${ModelicaUtilitiesName} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS} wsock32 ws2_32)
17-
ELSE(WIN32)
18-
target_link_libraries(${OSUName} ${OMCFactoryName} ${SimControllerName} ${ExtensionUtilitiesName} ${ModelicaUtilitiesName} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS})
19-
ENDIF(WIN32)
15+
#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 )
16+
#IF(WIN32)
17+
#target_link_libraries(${OSUName} ${OMCFactoryName} ${SimControllerName} ${ExtensionUtilitiesName} ${ModelicaUtilitiesName} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS} wsock32 ws2_32)
18+
#ELSE(WIN32)
19+
#target_link_libraries(${OSUName} ${OMCFactoryName} ${SimControllerName} ${ExtensionUtilitiesName} ${ModelicaUtilitiesName} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS})
20+
#ENDIF(WIN32)
2021

2122

22-
install(TARGETS ${OSUName} DESTINATION ${LIBINSTALLEXT})
23+
#install(TARGETS ${OSUName} DESTINATION ${LIBINSTALLEXT})
2324

2425

2526
IF(BUILD_SHARED_LIBS)
@@ -33,13 +34,15 @@ IF(BUILD_SHARED_LIBS)
3334

3435
IF(WIN32)
3536
target_link_libraries(${OSUSimName} ${OMCFactoryName} ${ExtensionUtilitiesName} ${ModelicaUtilitiesName} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS} wsock32 ws2_32)
36-
target_link_libraries(${OSUName} ${OMCFactoryName} ${SimControllerName} ${ExtensionUtilitiesName} ${ModelicaUtilitiesName} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS} wsock32 ws2_32)
37+
#Removed this library because the omsicpp code generation is skipped at the moment which used this library
38+
#target_link_libraries(${OSUName} ${OMCFactoryName} ${SimControllerName} ${ExtensionUtilitiesName} ${ModelicaUtilitiesName} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS} wsock32 ws2_32)
3739
ELSE(WIN32)
3840
target_link_libraries(${OSUSimName} ${OMCFactoryName} ${ExtensionUtilitiesName} ${ModelicaUtilitiesName} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS})
39-
target_link_libraries(${OSUName} ${OMCFactoryName} ${SimControllerName} ${ExtensionUtilitiesName} ${ModelicaUtilitiesName} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS} )
41+
#Removed this library because the omsicpp code generation is skipped at the moment which used this library
42+
#target_link_libraries(${OSUName} ${OMCFactoryName} ${SimControllerName} ${ExtensionUtilitiesName} ${ModelicaUtilitiesName} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS} )
4043
ENDIF(WIN32)
41-
42-
set_target_properties(${OSUName} PROPERTIES COMPILE_DEFINITIONS "RUNTIME_STATIC_LINKING;ENABLE_SUNDIALS_STATIC")
44+
#Removed this library because the omsicpp code generation is skipped at the moment which used this library
45+
#set_target_properties(${OSUName} PROPERTIES COMPILE_DEFINITIONS "RUNTIME_STATIC_LINKING;ENABLE_SUNDIALS_STATIC")
4346

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

0 commit comments

Comments
 (0)