diff options
| author | Robert Adam <dev@robert-adam.de> | 2020-10-24 18:38:56 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-24 18:38:56 +0300 |
| commit | bf9550a68e30b77d2d7b63094022244d26c6fd50 (patch) | |
| tree | acdf88703f1ae569b79b363db9842d15d24038cc /overlay | |
| parent | ceb4f1afe21c711262fd4392e0050015f24a1d34 (diff) | |
| parent | b9b41621c5916f15580813ca84774828835a37dc (diff) | |
Merge pull request #4503: 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.txt | 2 | ||||
| -rw-r--r-- | overlay/overlay_exe/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/overlay/CMakeLists.txt b/overlay/CMakeLists.txt index c0463e474..7dc197699 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) |