From 24eb9956f89167b1db9d24aad988e8cbf383090b Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 21 Jan 2014 05:45:30 -0700 Subject: [PATCH] Added missing interdependency references --- engine/shared/library/sharedFile/src/CMakeLists.txt | 2 ++ engine/shared/library/sharedFoundation/src/CMakeLists.txt | 6 +++++- engine/shared/library/sharedLog/src/CMakeLists.txt | 6 +++++- engine/shared/library/sharedMath/src/CMakeLists.txt | 1 + engine/shared/library/sharedNetwork/src/CMakeLists.txt | 4 +++- .../library/sharedNetworkMessages/src/CMakeLists.txt | 8 ++++++-- 6 files changed, 22 insertions(+), 5 deletions(-) diff --git a/engine/shared/library/sharedFile/src/CMakeLists.txt b/engine/shared/library/sharedFile/src/CMakeLists.txt index c16205fc..52d88ace 100644 --- a/engine/shared/library/sharedFile/src/CMakeLists.txt +++ b/engine/shared/library/sharedFile/src/CMakeLists.txt @@ -67,4 +67,6 @@ add_library(sharedFile STATIC target_link_libraries(sharedFile sharedCompression sharedDebug + sharedFoundation + fileInterface ) diff --git a/engine/shared/library/sharedFoundation/src/CMakeLists.txt b/engine/shared/library/sharedFoundation/src/CMakeLists.txt index 132b2262..710caa1b 100644 --- a/engine/shared/library/sharedFoundation/src/CMakeLists.txt +++ b/engine/shared/library/sharedFoundation/src/CMakeLists.txt @@ -121,7 +121,7 @@ if(WIN32) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/win32) else() - set(PLATFORM_SOURCES + set(PLATFORM_SOURCES linux/ByteOrder.h linux/ConfigSharedFoundation.cpp linux/ConfigSharedFoundation.h @@ -166,3 +166,7 @@ add_library(sharedFoundation STATIC ${SHARED_SOURCES} ${PLATFORM_SOURCES} ) + +target_link_libraries(sharedFoundation + sharedFile +) diff --git a/engine/shared/library/sharedLog/src/CMakeLists.txt b/engine/shared/library/sharedLog/src/CMakeLists.txt index 4aa318e7..4c7e45b6 100644 --- a/engine/shared/library/sharedLog/src/CMakeLists.txt +++ b/engine/shared/library/sharedLog/src/CMakeLists.txt @@ -29,7 +29,7 @@ if(WIN32) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/win32) else() - set(PLATFORM_SOURCES + set(PLATFORM_SOURCES linux/StderrLogger.cpp ) @@ -56,3 +56,7 @@ add_library(sharedLog STATIC ${SHARED_SOURCES} ${PLATFORM_SOURCES} ) + +target_link_libraries(sharedLog + sharedNetworkMessages +) diff --git a/engine/shared/library/sharedMath/src/CMakeLists.txt b/engine/shared/library/sharedMath/src/CMakeLists.txt index eab4eac7..e58839aa 100644 --- a/engine/shared/library/sharedMath/src/CMakeLists.txt +++ b/engine/shared/library/sharedMath/src/CMakeLists.txt @@ -134,4 +134,5 @@ add_library(sharedMath STATIC target_link_libraries(sharedMath sharedFile + sharedRandom ) diff --git a/engine/shared/library/sharedNetwork/src/CMakeLists.txt b/engine/shared/library/sharedNetwork/src/CMakeLists.txt index f50ca218..5fe30176 100644 --- a/engine/shared/library/sharedNetwork/src/CMakeLists.txt +++ b/engine/shared/library/sharedNetwork/src/CMakeLists.txt @@ -57,7 +57,7 @@ if(WIN32) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/win32) else() - set(PLATFORM_SOURCES + set(PLATFORM_SOURCES linux/Address.cpp linux/NetworkGetHostName.cpp linux/Sock.cpp @@ -95,4 +95,6 @@ add_library(sharedNetwork STATIC target_link_libraries(sharedNetwork sharedFoundation sharedLog + sharedMessageDispatch + udplibrary ) diff --git a/engine/shared/library/sharedNetworkMessages/src/CMakeLists.txt b/engine/shared/library/sharedNetworkMessages/src/CMakeLists.txt index 3ee2abcb..b07afa2b 100644 --- a/engine/shared/library/sharedNetworkMessages/src/CMakeLists.txt +++ b/engine/shared/library/sharedNetworkMessages/src/CMakeLists.txt @@ -423,7 +423,7 @@ set(SHARED_SOURCES shared/clientGameServer/MessageQueueSelectCurrentWorkingSkill.h shared/clientGameServer/MessageQueueSelectProfessionTemplate.cpp shared/clientGameServer/MessageQueueSelectProfessionTemplate.h - shared/clientGameServer/MessageQueueShipHit.cpp + shared/clientGameServer/MessageQueueShipHit.cpp shared/clientGameServer/MessageQueueShipHit.h shared/clientGameServer/MessageQueueShowCombatText.cpp shared/clientGameServer/MessageQueueShowCombatText.h @@ -691,7 +691,7 @@ set(SHARED_SOURCES shared/voicechat/VoiceChatMiscMessages.cpp shared/voicechat/VoiceChatMiscMessages.h shared/voicechat/VoiceChatOnGetAccount.cpp - shared/voicechat/VoiceChatOnGetAccount.h + shared/voicechat/VoiceChatOnGetAccount.h ) if(WIN32) @@ -731,3 +731,7 @@ add_library(sharedNetworkMessages STATIC ${SHARED_SOURCES} ${PLATFORM_SOURCES} ) + +target_link_libraries(sharedNetworkMessages + sharedUtility +)