From a21e7c738e3f03347a3e96bda11e29e090ad71b6 Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Sun, 15 Sep 2024 12:55:50 +0200
Subject: Build: Automatically include WindowsSettings.manifest in all
 executables instead of listing it separately as source file in every target

---
 cmake/platform/win/WindowsSettings.manifest | 13 +++++++++++++
 cmake/platform/win/settings.cmake           |  5 +++++
 src/CMakeLists.txt                          |  6 ------
 src/common/WindowsSettings.manifest         | 13 -------------
 src/server/bnetserver/CMakeLists.txt        |  2 --
 src/server/worldserver/CMakeLists.txt       |  2 --
 src/tools/map_extractor/CMakeLists.txt      |  2 --
 src/tools/mmaps_generator/CMakeLists.txt    |  2 --
 src/tools/vmap4_assembler/CMakeLists.txt    |  2 --
 src/tools/vmap4_extractor/CMakeLists.txt    |  2 --
 10 files changed, 18 insertions(+), 31 deletions(-)
 create mode 100644 cmake/platform/win/WindowsSettings.manifest
 delete mode 100644 src/common/WindowsSettings.manifest

diff --git a/cmake/platform/win/WindowsSettings.manifest b/cmake/platform/win/WindowsSettings.manifest
new file mode 100644
index 00000000000..b7da14cfe5c
--- /dev/null
+++ b/cmake/platform/win/WindowsSettings.manifest
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <activeCodePage xmlns="http://schemas.microsoft.com/SMI/2019/WindowsSettings">UTF-8</activeCodePage>
+    </windowsSettings>
+  </application>
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" /> <!-- Windows 10 -->
+    </application>
+  </compatibility>
+</assembly>
diff --git a/cmake/platform/win/settings.cmake b/cmake/platform/win/settings.cmake
index efae7696e17..dcec80a08c4 100644
--- a/cmake/platform/win/settings.cmake
+++ b/cmake/platform/win/settings.cmake
@@ -8,3 +8,8 @@ target_compile_definitions(trinity-compile-option-interface
 
 # set up output paths for executable binaries (.exe-files, and .dll-files on DLL-capable platforms)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/$<CONFIG>")
+
+# add WindowsSettings.manifest to all executables
+target_sources(trinity-core-interface
+  INTERFACE
+    $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:${CMAKE_SOURCE_DIR}/cmake/platform/win/WindowsSettings.manifest>)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f13f506e8e6..12a4db55845 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,12 +8,6 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-if(WIN32 AND MSVC)
-  set(sources_windows
-    ${CMAKE_SOURCE_DIR}/src/common/WindowsSettings.manifest
-  )
-endif()
-
 add_subdirectory(genrev)
 add_subdirectory(common)
 
diff --git a/src/common/WindowsSettings.manifest b/src/common/WindowsSettings.manifest
deleted file mode 100644
index b7da14cfe5c..00000000000
--- a/src/common/WindowsSettings.manifest
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-  <application xmlns="urn:schemas-microsoft-com:asm.v3">
-    <windowsSettings>
-      <activeCodePage xmlns="http://schemas.microsoft.com/SMI/2019/WindowsSettings">UTF-8</activeCodePage>
-    </windowsSettings>
-  </application>
-  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-    <application>
-      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" /> <!-- Windows 10 -->
-    </application>
-  </compatibility>
-</assembly>
diff --git a/src/server/bnetserver/CMakeLists.txt b/src/server/bnetserver/CMakeLists.txt
index ffb37f4012f..951e4abb2e1 100644
--- a/src/server/bnetserver/CMakeLists.txt
+++ b/src/server/bnetserver/CMakeLists.txt
@@ -16,8 +16,6 @@ CollectSourceFiles(
   # Exclude
   ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders)
 
-list(APPEND PRIVATE_SOURCES ${sources_windows})
-
 if (WIN32)
   if (MSVC)
     list(APPEND PRIVATE_SOURCES bnetserver.rc)
diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt
index 1b85fefd128..ca7a869ba16 100644
--- a/src/server/worldserver/CMakeLists.txt
+++ b/src/server/worldserver/CMakeLists.txt
@@ -14,8 +14,6 @@ CollectSourceFiles(
   # Exclude
   ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders)
 
-list(APPEND PRIVATE_SOURCES ${sources_windows})
-
 if(WIN32)
   if(MSVC)
     list(APPEND PRIVATE_SOURCES worldserver.rc)
diff --git a/src/tools/map_extractor/CMakeLists.txt b/src/tools/map_extractor/CMakeLists.txt
index 0613d0a7d4f..7da1f5fc949 100644
--- a/src/tools/map_extractor/CMakeLists.txt
+++ b/src/tools/map_extractor/CMakeLists.txt
@@ -12,8 +12,6 @@ CollectSourceFiles(
   ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE_SOURCES)
 
-list(APPEND PRIVATE_SOURCES ${sources_windows})
-
 add_executable(mapextractor
   ${PRIVATE_SOURCES}
 )
diff --git a/src/tools/mmaps_generator/CMakeLists.txt b/src/tools/mmaps_generator/CMakeLists.txt
index 61a2548f898..371b80604fb 100644
--- a/src/tools/mmaps_generator/CMakeLists.txt
+++ b/src/tools/mmaps_generator/CMakeLists.txt
@@ -12,8 +12,6 @@ CollectSourceFiles(
   ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE_SOURCES)
 
-list(APPEND PRIVATE_SOURCES ${sources_windows})
-
 add_executable(mmaps_generator ${PRIVATE_SOURCES})
 
 target_link_libraries(mmaps_generator
diff --git a/src/tools/vmap4_assembler/CMakeLists.txt b/src/tools/vmap4_assembler/CMakeLists.txt
index 2511946d702..71378937f04 100644
--- a/src/tools/vmap4_assembler/CMakeLists.txt
+++ b/src/tools/vmap4_assembler/CMakeLists.txt
@@ -13,8 +13,6 @@ set(PRIVATE_SOURCES
   TileAssembler.h
   VMapAssembler.cpp)
 
-list(APPEND PRIVATE_SOURCES ${sources_windows})
-
 add_executable(vmap4assembler ${PRIVATE_SOURCES})
 
 target_link_libraries(vmap4assembler
diff --git a/src/tools/vmap4_extractor/CMakeLists.txt b/src/tools/vmap4_extractor/CMakeLists.txt
index 075021e860b..95ae191053d 100644
--- a/src/tools/vmap4_extractor/CMakeLists.txt
+++ b/src/tools/vmap4_extractor/CMakeLists.txt
@@ -12,8 +12,6 @@ CollectSourceFiles(
   ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE_SOURCES)
 
-list(APPEND PRIVATE_SOURCES ${sources_windows})
-
 add_executable(vmap4extractor ${PRIVATE_SOURCES})
 
 target_link_libraries(vmap4extractor
-- 
cgit v1.2.3