Build: Automatically include WindowsSettings.manifest in all executables instead of listing it separately as source file in every target

(cherry picked from commit a21e7c738e3f03347a3e96bda11e29e090ad71b6)

9 files changed, 5 insertions, 18 deletions

diff --git a/src/common/WindowsSettings.manifest b/cmake/platform/win/WindowsSettings.manifest
index b7da14cfe5c..b7da14cfe5c 100644
--- a/src/common/WindowsSettings.manifest
+++ b/cmake/platform/win/WindowsSettings.manifest
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/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