From 93dcfddac5694d95486ca33670a0c36f00ece58d Mon Sep 17 00:00:00 2001 From: jadebenn Date: Tue, 17 Dec 2024 01:10:17 -0600 Subject: [PATCH] try to fix CI failures on Windows and MacOS --- dGame/dBehaviors/CMakeLists.txt | 2 +- dGame/dComponents/CMakeLists.txt | 2 +- dGame/dGameMessages/CMakeLists.txt | 2 +- dGame/dInventory/CMakeLists.txt | 2 +- tests/dECSTests/TestECS.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dGame/dBehaviors/CMakeLists.txt b/dGame/dBehaviors/CMakeLists.txt index ca930afa..e8dcf7d8 100644 --- a/dGame/dBehaviors/CMakeLists.txt +++ b/dGame/dBehaviors/CMakeLists.txt @@ -55,7 +55,7 @@ set(DGAME_DBEHAVIORS_SOURCES "AirMovementBehavior.cpp" "VerifyBehavior.cpp") add_library(dBehaviors OBJECT ${DGAME_DBEHAVIORS_SOURCES}) -target_link_libraries(dBehaviors PUBLIC dDatabaseCDClient dPhysics magic_enum::magic_enum tinyxml2) +target_link_libraries(dBehaviors PUBLIC dDatabaseCDClient dPhysics magic_enum::magic_enum) target_include_directories(dBehaviors PUBLIC "." "${PROJECT_SOURCE_DIR}/dGame/dGameMessages" # via BehaviorContext.h PRIVATE diff --git a/dGame/dComponents/CMakeLists.txt b/dGame/dComponents/CMakeLists.txt index 82f019b7..7f4e1ef6 100644 --- a/dGame/dComponents/CMakeLists.txt +++ b/dGame/dComponents/CMakeLists.txt @@ -79,4 +79,4 @@ target_include_directories(dComponents PUBLIC "." ) target_precompile_headers(dComponents REUSE_FROM dGameBase) -target_link_libraries(dComponents PUBLIC magic_enum::magic_enum tinyxml2 INTERFACE dBehaviors) +target_link_libraries(dComponents PUBLIC magic_enum::magic_enum INTERFACE dBehaviors) diff --git a/dGame/dGameMessages/CMakeLists.txt b/dGame/dGameMessages/CMakeLists.txt index 9da8a185..6f57595f 100644 --- a/dGame/dGameMessages/CMakeLists.txt +++ b/dGame/dGameMessages/CMakeLists.txt @@ -6,7 +6,7 @@ set(DGAME_DGAMEMESSAGES_SOURCES add_library(dGameMessages OBJECT ${DGAME_DGAMEMESSAGES_SOURCES}) target_link_libraries(dGameMessages - PUBLIC magic_enum::magic_enum tinyxml2 dDatabase + PUBLIC magic_enum::magic_enum dDatabase INTERFACE dGameBase # TradingManager ) target_include_directories(dGameMessages PUBLIC "." diff --git a/dGame/dInventory/CMakeLists.txt b/dGame/dInventory/CMakeLists.txt index 530777c6..a100029c 100644 --- a/dGame/dInventory/CMakeLists.txt +++ b/dGame/dInventory/CMakeLists.txt @@ -24,7 +24,7 @@ target_include_directories(dInventory PUBLIC "." "${PROJECT_SOURCE_DIR}/dGame/dMission" # via MissionComponent.h "${PROJECT_SOURCE_DIR}/dZoneManager" # via Item.cpp ) -target_link_libraries(dInventory PUBLIC magic_enum::magic_enum tinyxml2) +target_link_libraries(dInventory PUBLIC magic_enum::magic_enum) target_precompile_headers(dInventory REUSE_FROM dGameBase) # Workaround for compiler bug where the optimized code could result in a memcpy of 0 bytes, even though that isnt possible. # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=97185 diff --git a/tests/dECSTests/TestECS.cpp b/tests/dECSTests/TestECS.cpp index 1ff29145..f235522a 100644 --- a/tests/dECSTests/TestECS.cpp +++ b/tests/dECSTests/TestECS.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "Core.h" #include