Resolve merge conflicts

This commit is contained in:
luwenpeng
2024-05-20 11:12:24 +08:00
parent ccaddf7fdb
commit 0e33a1b647
24 changed files with 172 additions and 183 deletions

View File

@@ -4,5 +4,4 @@ target_link_libraries(core times plugin_manager session_manager ip_reassembly pa
add_executable(stellar main.cpp)
target_link_libraries(stellar core)
target_link_libraries(stellar "-rdynamic")
install(TARGETS stellar RUNTIME DESTINATION bin COMPONENT Program)
install(TARGETS stellar RUNTIME DESTINATION bin COMPONENT Program)