From b7f9dfef4a87538ce963c328d119a0c7062012ac Mon Sep 17 00:00:00 2001
From: Oliver Hamlet <git@ortham.net>
Date: Sun, 28 Apr 2024 10:41:19 +0100
Subject: [PATCH] Tidy up setting target-specific flags

---
 CMakeLists.txt    |  3 +--
 cmake/tests.cmake | 32 ++++++--------------------------
 2 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c9fa4a2f..6737bdda 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -303,8 +303,7 @@ set(LIBLOOT_INCLUDE_DIRS
 set(LIBLOOT_COMMON_SYSTEM_INCLUDE_DIRS
     ${LIBLOADORDER_INCLUDE_DIRS}
     ${ESPLUGIN_INCLUDE_DIRS}
-    ${LCI_INCLUDE_DIRS}
-    ${ICU_INCLUDE_DIRS})
+    ${LCI_INCLUDE_DIRS})
 
 target_include_directories(loot PUBLIC
     "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
diff --git a/cmake/tests.cmake b/cmake/tests.cmake
index cafdb9a3..bcdbeaf2 100644
--- a/cmake/tests.cmake
+++ b/cmake/tests.cmake
@@ -129,49 +129,29 @@ target_link_libraries(libloot_tests PRIVATE loot Boost::headers GTest::gtest_mai
 # Set Target-Specific Flags
 ##############################
 
-set(LIBLOOT_INCLUDE_DIRS
-"${CMAKE_SOURCE_DIR}/src"
-"${CMAKE_SOURCE_DIR}/include")
-
-set(LIBLOOT_COMMON_SYSTEM_INCLUDE_DIRS
-${LIBLOADORDER_INCLUDE_DIRS}
-${ESPLUGIN_INCLUDE_DIRS}
-${LCI_INCLUDE_DIRS}
-${ICU_INCLUDE_DIRS})
-
 target_include_directories(libloot_internals_tests PRIVATE
-${LIBLOOT_INCLUDE_DIRS})
+    ${LIBLOOT_INCLUDE_DIRS})
 
 target_include_directories(libloot_internals_tests SYSTEM PRIVATE
-${LIBLOOT_COMMON_SYSTEM_INCLUDE_DIRS}
-${GTEST_INCLUDE_DIRS})
+    ${LIBLOOT_COMMON_SYSTEM_INCLUDE_DIRS})
 
 target_include_directories(libloot_tests PRIVATE ${LIBLOOT_INCLUDE_DIRS})
 target_include_directories(libloot_tests SYSTEM PRIVATE
-    ${LIBLOOT_COMMON_SYSTEM_INCLUDE_DIRS}
-    ${GTEST_INCLUDE_DIRS})
+    ${LIBLOOT_COMMON_SYSTEM_INCLUDE_DIRS})
 
 if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
     target_compile_definitions(libloot_internals_tests PRIVATE
         UNICODE _UNICODE LOOT_STATIC YAML_CPP_STATIC_DEFINE)
     target_compile_definitions(libloot_tests PRIVATE UNICODE _UNICODE)
 
-    set(LOOT_LIBS ws2_32 bcrypt)
-
     if(NOT CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
         target_compile_definitions(libloot_tests PRIVATE LOOT_STATIC)
-        set(LOOT_LIBS ${LOOT_LIBS} tbb_static)
     endif()
-
-    target_link_libraries(libloot_internals_tests PRIVATE ${LOOT_LIBS})
-    target_link_libraries(libloot_tests PRIVATE ${LOOT_LIBS})
-else()
-    set(LOOT_LIBS ICU::data ICU::uc pthread TBB::tbb)
-
-    target_link_libraries(libloot_internals_tests PRIVATE ${LOOT_LIBS})
-    target_link_libraries(libloot_tests PRIVATE ${LOOT_LIBS})
 endif()
 
+target_link_libraries(libloot_internals_tests PRIVATE ${LOOT_LIBS})
+target_link_libraries(libloot_tests PRIVATE ${LOOT_LIBS})
+
 if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
     set_target_properties(libloot_internals_tests libloot_tests
         PROPERTIES