Skip to content

Commit 94de8fc

Browse files
authored
Don't add static C / C++ lib to dynamic libs (#916)
* Don't add static C / C++ lib to dynamic libs * Removing staic libc from linking
1 parent 7de662d commit 94de8fc

2 files changed

Lines changed: 2 additions & 8 deletions

File tree

CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ ELSEIF(APPLE)
3232
set(PLATFORM_STRING "mac")
3333
ELSE()
3434
set(PLATFORM_STRING "linux")
35-
set(STATIC_LIBGCC "-static-libgcc")
3635
ENDIF()
3736

3837
# Don't allow in-source build

src/OMSimulatorLib/CMakeLists.txt

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -154,19 +154,14 @@ IF (WIN32 AND MSVC)
154154
add_definitions(-DBOOST_ALL_DYN_LINK)
155155
ENDIF ()
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

160160
IF (WIN32 AND MINGW)
161161
target_link_libraries(OMSimulatorLib shlwapi)
162162
target_link_libraries(OMSimulatorLib_static shlwapi)
163163
ENDIF ()
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-
170165
IF (WIN32)
171166
install(TARGETS OMSimulatorLib DESTINATION bin)
172167
ELSE ()

0 commit comments

Comments
 (0)