always use udplibrary target vs direct include

This commit is contained in:
eb
2021-11-26 07:39:26 -07:00
parent 0a59ad0aa6
commit bf58575b8a
2 changed files with 82 additions and 83 deletions

View File

@@ -1,19 +1,19 @@
add_library(
stationapi
Node.hpp
NodeClient.cpp
NodeClient.hpp
Serialization.hpp
SQLite3.hpp
StreamUtils.cpp
StreamUtils.hpp
StringUtils.cpp
StringUtils.hpp)
add_library(stationapi
Node.hpp
NodeClient.cpp
NodeClient.hpp
Serialization.hpp
SQLite3.hpp
StreamUtils.cpp
StreamUtils.hpp
StringUtils.cpp
StringUtils.hpp)
target_include_directories(
stationapi
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/externals/catch
${PROJECT_SOURCE_DIR}/externals/easyloggingpp ${Boost_INCLUDE_DIRS}
${SQLite3_INCLUDE_DIR})
target_include_directories(stationapi PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
${PROJECT_SOURCE_DIR}/externals/catch
${PROJECT_SOURCE_DIR}/externals/easyloggingpp
${PROJECT_SOURCE_DIR}/externals/udplibrary
${Boost_INCLUDE_DIRS}
${SQLite3_INCLUDE_DIR})
target_link_libraries(stationapi udplibrary)

View File

@@ -1,75 +1,74 @@
add_executable(
stationchat
protocol/AddBan.hpp
protocol/AddFriend.hpp
protocol/AddIgnore.hpp
protocol/AddInvite.hpp
protocol/AddModerator.hpp
protocol/CreateRoom.hpp
protocol/DestroyAvatar.hpp
protocol/DestroyRoom.hpp
protocol/EnterRoom.hpp
protocol/FailoverReLoginAvatar.hpp
protocol/FriendStatus.hpp
protocol/GetAnyAvatar.hpp
protocol/GetPersistentHeaders.hpp
protocol/GetPersistentMessage.hpp
protocol/GetRoom.hpp
protocol/GetRoomSummaries.hpp
protocol/IgnoreStatus.hpp
protocol/KickAvatar.hpp
protocol/LeaveRoom.hpp
protocol/LoginAvatar.hpp
protocol/LogoutAvatar.hpp
protocol/Protocol.cpp
protocol/RegistrarGetChatServer.hpp
protocol/RemoveBan.hpp
protocol/RemoveFriend.hpp
protocol/RemoveIgnore.hpp
protocol/RemoveInvite.hpp
protocol/RemoveModerator.hpp
protocol/SendInstantMessage.hpp
protocol/SendPersistentMessage.hpp
protocol/SendRoomMessage.hpp
protocol/SetApiVersion.hpp
protocol/SetAvatarAttributes.hpp
protocol/UpdatePersistentMessage.hpp
ChatAvatar.cpp
ChatAvatar.hpp
ChatAvatarService.cpp
ChatAvatarService.hpp
ChatEnums.cpp
ChatEnums.hpp
ChatRoom.cpp
ChatRoom.hpp
ChatRoomService.cpp
ChatRoomService.hpp
GatewayClient.cpp
GatewayClient.hpp
GatewayNode.cpp
GatewayNode.hpp
main.cpp
Message.hpp
PersistentMessage.hpp
PersistentMessageService.cpp
PersistentMessageService.hpp
RegistrarClient.cpp
RegistrarClient.hpp
RegistrarNode.cpp
RegistrarNode.hpp
StationChatApp.cpp
StationChatApp.hpp
StationChatConfig.hpp)
add_executable(stationchat
protocol/AddBan.hpp
protocol/AddFriend.hpp
protocol/AddIgnore.hpp
protocol/AddInvite.hpp
protocol/AddModerator.hpp
protocol/CreateRoom.hpp
protocol/DestroyAvatar.hpp
protocol/DestroyRoom.hpp
protocol/EnterRoom.hpp
protocol/FailoverReLoginAvatar.hpp
protocol/FriendStatus.hpp
protocol/GetAnyAvatar.hpp
protocol/GetPersistentHeaders.hpp
protocol/GetPersistentMessage.hpp
protocol/GetRoom.hpp
protocol/GetRoomSummaries.hpp
protocol/IgnoreStatus.hpp
protocol/KickAvatar.hpp
protocol/LeaveRoom.hpp
protocol/LoginAvatar.hpp
protocol/LogoutAvatar.hpp
protocol/Protocol.cpp
protocol/RegistrarGetChatServer.hpp
protocol/RemoveBan.hpp
protocol/RemoveFriend.hpp
protocol/RemoveIgnore.hpp
protocol/RemoveInvite.hpp
protocol/RemoveModerator.hpp
protocol/SendInstantMessage.hpp
protocol/SendPersistentMessage.hpp
protocol/SendRoomMessage.hpp
protocol/SetApiVersion.hpp
protocol/SetAvatarAttributes.hpp
protocol/UpdatePersistentMessage.hpp
ChatAvatar.cpp
ChatAvatar.hpp
ChatAvatarService.cpp
ChatAvatarService.hpp
ChatEnums.cpp
ChatEnums.hpp
ChatRoom.cpp
ChatRoom.hpp
ChatRoomService.cpp
ChatRoomService.hpp
GatewayClient.cpp
GatewayClient.hpp
GatewayNode.cpp
GatewayNode.hpp
main.cpp
Message.hpp
PersistentMessage.hpp
PersistentMessageService.cpp
PersistentMessageService.hpp
RegistrarClient.cpp
RegistrarClient.hpp
RegistrarNode.cpp
RegistrarNode.hpp
StationChatApp.cpp
StationChatApp.hpp
StationChatConfig.hpp)
# cmake-format: off
target_link_libraries(stationchat
stationapi
udplibrary
${Boost_LIBRARIES}
${SQLite3_LIBRARY}
$<$<PLATFORM_ID:Windows>:ws2_32>)
# cmake-format: on
target_include_directories(stationchat PRIVATE
${CMAKE_CURRENT_SOURCE_DIR})
target_include_directories(stationchat PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
install(TARGETS stationchat RUNTIME DESTINATION bin)