diff options
| author | Petr Mrázek <peterix@gmail.com> | 2018-01-16 06:46:43 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2018-01-16 06:48:10 +0100 |
| commit | d0e58acd843fcc04463497e9ffbbcab0dee72d55 (patch) | |
| tree | 63d7ff08bcd08b1ad80105b98801090f4808ef7c /application | |
| parent | 360d877abf44324ba6cef2340381384a8da71060 (diff) | |
| download | MultiMC-d0e58acd843fcc04463497e9ffbbcab0dee72d55.tar MultiMC-d0e58acd843fcc04463497e9ffbbcab0dee72d55.tar.gz MultiMC-d0e58acd843fcc04463497e9ffbbcab0dee72d55.tar.lz MultiMC-d0e58acd843fcc04463497e9ffbbcab0dee72d55.tar.xz MultiMC-d0e58acd843fcc04463497e9ffbbcab0dee72d55.zip | |
GH-2103 add suggested changes from the pull request
Diffstat (limited to 'application')
| -rw-r--r-- | application/CMakeLists.txt | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/application/CMakeLists.txt b/application/CMakeLists.txt index c7c31e89..ef45d584 100644 --- a/application/CMakeLists.txt +++ b/application/CMakeLists.txt @@ -393,9 +393,13 @@ elseif(MultiMC_LAYOUT_REAL STREQUAL "lin-nodeps") install(PROGRAMS package/linux/MultiMC DESTINATION ${BUNDLE_DEST_DIR}) elseif(MultiMC_LAYOUT_REAL STREQUAL "lin-system") - set(MultiMC_BINARY_DEST_DIR "usr/bin" CACHE STRING "Relative path from packaging root to the binary directory") - set(MultiMC_LIBRARY_DEST_DIR "usr/lib" CACHE STRING "Relative path from packaging root to the library directory") - set(MultiMC_SHARE_DEST_DIR "usr/share/multimc" CACHE STRING "Relative path from packaging root to the shared data directory") + if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + SET(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "Base directory for executables and libraries" FORCE) + endif() + + set(MultiMC_BINARY_DEST_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE STRING "Path to the binary directory") + set(MultiMC_LIBRARY_DEST_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE STRING "Path to the library directory") + set(MultiMC_SHARE_DEST_DIR "${CMAKE_INSTALL_PREFIX}/share/multimc" CACHE STRING "Path to the shared data directory") set(MultiMC_APP_BINARY_NAME "multimc" CACHE STRING "Name of the MultiMC binary for the purposes of linux packaging") set(JARS_DEST_DIR "${MultiMC_SHARE_DEST_DIR}") |