RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 12:37:45 +00:00
Code Issues Activity Actions

WebSocket: Change target name to deconflict with LibWebSocket on Lagom

Browse source 
When compiling with Lagom, we give both LibWebSocket and the WebSocket
IPC service the Lagom:: prefix as an alias, but strip the Lib from all
library target names before applying the prefix. This creates a conflict
when external projects used the aliased name between the server and the
library. Give WebSocket a name that deconflicts it, but keep the binary
name the same, /bin/WebSocket.
This commit is contained in:
Andrew Kaster 2022-07-07 08:39:56 -06:00 • committed by Linus Groh
parent 7fbc354829
commit b1b61c902d
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Userland/Services/WebSocket/CMakeLists.txt
View file

@ -1,6 +1,6 @@
serenity_component(
WebSocket
TARGETS WebSocket
TARGETS WebSocketServer
)
compile_ipc(WebSocketServer.ipc WebSocketServerEndpoint.h)
@ -13,5 +13,9 @@ set(SOURCES
WebSocketServerEndpoint.h
)
serenity_bin(WebSocket)
target_link_libraries(WebSocket LibCore LibIPC LibWebSocket LibMain)
# Note: We use a target name of WebSocketServer here to deconflict with the
# Lagom namespaced target name for LibWebSocket, Lagom::WebSocket.
# The server binary name is still WebSocket.
serenity_bin(WebSocketServer)
set_target_properties(WebSocketServer PROPERTIES OUTPUT_NAME WebSocket)
target_link_libraries(WebSocketServer LibCore LibIPC LibWebSocket LibMain)