Skip to content

Commit

Permalink
Merge pull request mumble-voip#4473: BUILD(cmake): Also install man f…
Browse files Browse the repository at this point in the history
…iles

On Unix-systems (Linux & Mac) we now also install our man-files when
the user invokes the generated install target.

Fixes mumble-voip#4472
  • Loading branch information
Krzmbrzl authored Sep 11, 2020
2 parents d5a059f + 4f330cc commit fb0505d
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 0 deletions.
5 changes: 5 additions & 0 deletions overlay_gl/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

# Overlay payload for UNIX-like systems.

include(GNUInstallDirs)

if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "amd64")
option(overlay-xcompile "Build 32 bit overlay library, necessary for the overlay to work with 32 bit processes." ON)
endif()
Expand Down Expand Up @@ -116,3 +118,6 @@ else()
${LIB_COREFOUNDATION}
)
endif()

# install overlay man-files
install(FILES "${CMAKE_SOURCE_DIR}/man/mumble-overlay.1" DESTINATION "${CMAKE_INSTALL_MANDIR}/man1" COMPONENT doc)
5 changes: 5 additions & 0 deletions src/mumble/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
# that can be found in the LICENSE file at the root of the
# Mumble source tree or at <https://www.mumble.info/LICENSE>.

include(GNUInstallDirs)

set(MUMBLE_RC "${CMAKE_CURRENT_BINARY_DIR}/mumble.rc")
set(MUMBLE_DLL_RC "${CMAKE_CURRENT_BINARY_DIR}/mumble_dll.rc")
set(MUMBLE_PLIST "${CMAKE_CURRENT_BINARY_DIR}/mumble.plist")
Expand Down Expand Up @@ -305,6 +307,9 @@ else()
else()
install(TARGETS mumble BUNDLE DESTINATION . COMPONENT mumble_client)
endif()

# Install Mumble man files
install(FILES "${CMAKE_SOURCE_DIR}/man/mumble.1" DESTINATION "${CMAKE_INSTALL_MANDIR}/man1" COMPONENT doc)
endif()

target_compile_definitions(mumble
Expand Down
6 changes: 6 additions & 0 deletions src/murmur/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
# that can be found in the LICENSE file at the root of the
# Mumble source tree or at <https://www.mumble.info/LICENSE>.

include(GNUInstallDirs)

set(MURMUR_RC "${CMAKE_CURRENT_BINARY_DIR}/murmur.rc")
set(MURMUR_ICON "${CMAKE_SOURCE_DIR}/icons/murmur.ico")
set(MURMUR_PLIST "${CMAKE_CURRENT_BINARY_DIR}/murmur.plist")
Expand Down Expand Up @@ -312,4 +314,8 @@ if(WIN32)
install(TARGETS murmur RUNTIME DESTINATION . COMPONENT mumble_server)
else()
install(TARGETS murmur RUNTIME DESTINATION bin COMPONENT mumble_server)

# Install Murmur man files
install(FILES "${CMAKE_SOURCE_DIR}/man/murmurd.1" DESTINATION "${CMAKE_INSTALL_MANDIR}/man1" COMPONENT doc)
install(FILES "${CMAKE_SOURCE_DIR}/man/murmur-user-wrapper.1" DESTINATION "${CMAKE_INSTALL_MANDIR}/man1" COMPONENT doc)
endif()

0 comments on commit fb0505d

Please sign in to comment.