From 58f9def30fe4f0f017538acc29e53fedd016893c 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

(cherry picked from commit a21e7c738e3f03347a3e96bda11e29e090ad71b6)
---
 src/CMakeLists.txt                       |  6 ------
 src/common/WindowsSettings.manifest      | 13 -------------
 src/server/authserver/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 --
 8 files changed, 31 deletions(-)
 delete mode 100644 src/common/WindowsSettings.manifest

(limited to 'src')

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/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt
index 9536ae2578a..ac887a897e2 100644
--- a/src/server/authserver/CMakeLists.txt
+++ b/src/server/authserver/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 authserver.rc)
diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt
index 69534d8c69d..84e247249a7 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 73d13b4c665..007666eb950 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 cb19b3a095a..0fc5db86c77 100644
--- a/src/tools/vmap4_assembler/CMakeLists.txt
+++ b/src/tools/vmap4_assembler/CMakeLists.txt
@@ -10,8 +10,6 @@
 
 set(PRIVATE_SOURCES 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 9d997b16296..1a02ec7c73d 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