diff options
-rw-r--r-- | CMakeLists.txt | 16 | ||||
-rw-r--r-- | plugins/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/mumble/CMakeLists.txt | 2 |
3 files changed, 18 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e17cdd6f6..7bba988b3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,6 +35,7 @@ list(APPEND CMAKE_MODULE_PATH include(pkg-utils) include(CTest) include(project-utils) +include(GNUInstallDirs) option(BUILD_TESTING "Build tests." OFF) @@ -84,6 +85,21 @@ endif() include(compiler) include(os) +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + if(UNIX) + # Use default GNU location + set(DEFAULT_LIBDIR "${CMAKE_INSTALL_LIBDIR}/mumble") + else() + # Default to current directory + set(DEFAULT_LIBDIR "./lib/mumble") + endif() +else() + # Use a path relative to the prefix + set(DEFAULT_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib/mumble") +endif() + +set(MUMBLE_INSTALL_LIBDIR "${DEFAULT_LIBDIR}" CACHE STRING "The path to which Mumble will install its plugins") + if (64_BIT) set(ARCH "64bit") else() diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 660ba7f43..223f63c72 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -29,7 +29,7 @@ foreach(ITEM ${ITEMS}) else() # Shared library on UNIX (e.g. ".so") set_target_properties(${ITEM} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/plugins") - install(TARGETS ${ITEM} LIBRARY DESTINATION lib/plugins COMPONENT mumble_client) + install(TARGETS ${ITEM} LIBRARY DESTINATION "${MUMBLE_INSTALL_LIBDIR}/plugins" COMPONENT mumble_client) endif() endif() endforeach() diff --git a/src/mumble/CMakeLists.txt b/src/mumble/CMakeLists.txt index 53b6975c1..2601b0628 100644 --- a/src/mumble/CMakeLists.txt +++ b/src/mumble/CMakeLists.txt @@ -535,7 +535,7 @@ if(bundled-celt) else() # Shared library on UNIX (e.g. ".so") set_target_properties(celt PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) - install(TARGETS celt LIBRARY DESTINATION lib) + install(TARGETS celt LIBRARY DESTINATION "${MUMBLE_INSTALL_LIBDIR}") endif() else() find_pkg(celt REQUIRED) |