File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -32,7 +32,6 @@ ELSEIF(APPLE)
3232 set (PLATFORM_STRING "mac" )
3333ELSE ()
3434 set (PLATFORM_STRING "linux" )
35- set (STATIC_LIBGCC "-static-libgcc" )
3635ENDIF ()
3736
3837# Don't allow in-source build
Original file line number Diff line number Diff line change @@ -154,19 +154,14 @@ IF (WIN32 AND MSVC)
154154 add_definitions (-DBOOST_ALL_DYN_LINK )
155155ENDIF ()
156156
157- target_link_libraries (OMSimulatorLib fmilib sundials_kinsol sundials_cvode sundials_nvecserial minizip ${LIB_ATOMIC} ${Boost_LIBRARIES} ${OMTLM_LINKFLAGS} ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT} ${CPP_FS_LIBS} ${STATIC_LIBGCC} )
158- target_link_libraries (OMSimulatorLib_static fmilib sundials_kinsol sundials_cvode sundials_nvecserial minizip lua ${CMAKE_DL_LIBS} ${LIB_ATOMIC} ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES} ${OMTLM_LINKFLAGS} ${CPP_FS_LIBS} ${STATIC_LIBGCC} )
157+ target_link_libraries (OMSimulatorLib fmilib sundials_kinsol sundials_cvode sundials_nvecserial minizip ${LIB_ATOMIC} ${Boost_LIBRARIES} ${OMTLM_LINKFLAGS} ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT} ${CPP_FS_LIBS} )
158+ target_link_libraries (OMSimulatorLib_static fmilib sundials_kinsol sundials_cvode sundials_nvecserial minizip lua ${CMAKE_DL_LIBS} ${LIB_ATOMIC} ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES} ${OMTLM_LINKFLAGS} ${CPP_FS_LIBS} )
159159
160160IF (WIN32 AND MINGW)
161161 target_link_libraries (OMSimulatorLib shlwapi )
162162 target_link_libraries (OMSimulatorLib_static shlwapi )
163163ENDIF ()
164164
165- IF (NOT (WIN32 OR MSVC ))
166- target_link_libraries (OMSimulatorLib "-static-libstdc++" )
167- target_link_libraries (OMSimulatorLib_static "-static-libstdc++" )
168- ENDIF ()
169-
170165IF (WIN32 )
171166 install (TARGETS OMSimulatorLib DESTINATION bin)
172167ELSE ()
You can’t perform that action at this time.
0 commit comments