Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Adam <dev@robert-adam.de>2022-08-28 19:28:31 +0300
committerRobert Adam <dev@robert-adam.de>2022-09-10 18:28:34 +0300
commit406ce93b47dffa7bcd5c2e69726c2bca64222b19 (patch)
tree225305f012dda91341892841970d9d0b84c8eecd /src/mumble
parent4b6aabe5ac9f20690a0695836ccdc4da7376b42d (diff)
MAINT: Use separate directory for auxiliary files
Diffstat (limited to 'src/mumble')
-rw-r--r--src/mumble/CMakeLists.txt5
-rw-r--r--src/mumble/mumble.appcompat.manifest12
2 files changed, 1 insertions, 16 deletions
diff --git a/src/mumble/CMakeLists.txt b/src/mumble/CMakeLists.txt
index dc1e7408f..95754e69c 100644
--- a/src/mumble/CMakeLists.txt
+++ b/src/mumble/CMakeLists.txt
@@ -353,7 +353,7 @@ else()
if(WIN32)
target_sources(mumble_client_object_lib
PRIVATE
- "mumble.appcompat.manifest"
+ "${CMAKE_SOURCE_DIR}/auxiliary_files/mumble.appcompat.manifest"
"${MUMBLE_RC}"
)
@@ -417,9 +417,6 @@ else()
else()
install(TARGETS mumble BUNDLE DESTINATION "${MUMBLE_INSTALL_EXECUTABLEDIR}" COMPONENT mumble_client)
endif()
-
- # Install Mumble man files
- install(FILES "${CMAKE_SOURCE_DIR}/man/mumble.1" DESTINATION "${MUMBLE_INSTALL_MANDIR}" COMPONENT doc)
endif()
target_compile_definitions(mumble_client_object_lib
diff --git a/src/mumble/mumble.appcompat.manifest b/src/mumble/mumble.appcompat.manifest
deleted file mode 100644
index fa9d34422..000000000
--- a/src/mumble/mumble.appcompat.manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
- <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
- <application>
- <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/><!-- Vista -->
- <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/><!-- Win 7 -->
- <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/><!-- Win 8 -->
- <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/><!-- Win 8.1 -->
- <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/><!-- Win 10 -->
- </application>
- </compatibility>
-</assembly>