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 <krzmbrzl@gmail.com>2020-09-23 13:04:01 +0300
committerRobert Adam <dev@robert-adam.de>2020-10-24 16:57:01 +0300
commitb9b41621c5916f15580813ca84774828835a37dc (patch)
treef6862ac97eb99dc8ba3fe6632bbe37585c90eea5 /overlay
parente0fe7dca1de995b5908d07968c319ea893f1d7d4 (diff)
BUILD(cmake): Revamp install paths
Installation paths can now be fine-tuned by setting the respective MUMBLE_INSTALLATION_* variables when invoking cmake. Additionally some components that only had install rules for a certain OS are now installed on all OSes as these components should be needed there as well.
Diffstat (limited to 'overlay')
-rw-r--r--overlay/CMakeLists.txt2
-rw-r--r--overlay/overlay_exe/CMakeLists.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/overlay/CMakeLists.txt b/overlay/CMakeLists.txt
index e46a49fc3..160703b3b 100644
--- a/overlay/CMakeLists.txt
+++ b/overlay/CMakeLists.txt
@@ -128,7 +128,7 @@ else()
${CMAKE_CURRENT_BINARY_DIR}
)
- install(TARGETS overlay RUNTIME DESTINATION . COMPONENT mumble_client)
+ install(TARGETS overlay RUNTIME DESTINATION "${MUMBLE_INSTALL_EXECUTABLEDIR}" COMPONENT mumble_client)
endif()
if(64_BIT AND NOT BUILD_OVERLAY_XCOMPILE)
diff --git a/overlay/overlay_exe/CMakeLists.txt b/overlay/overlay_exe/CMakeLists.txt
index cb32ff33f..4b54c8a6f 100644
--- a/overlay/overlay_exe/CMakeLists.txt
+++ b/overlay/overlay_exe/CMakeLists.txt
@@ -39,7 +39,7 @@ else()
target_include_directories(overlay_exe PRIVATE ${CMAKE_SOURCE_DIR}/overlay)
- install(TARGETS overlay_exe RUNTIME DESTINATION . COMPONENT mumble_client)
+ install(TARGETS overlay_exe RUNTIME DESTINATION "${MUMBLE_INSTALL_EXECUTABLEDIR}" COMPONENT mumble_client)
endif()
if(MSVC)