diff options
| author | Carl Philipp Reh <carlphilippreh@gmail.com> | 2018-01-13 15:50:56 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2018-01-16 06:47:58 +0100 |
| commit | 360d877abf44324ba6cef2340381384a8da71060 (patch) | |
| tree | 8932bd103275f954a54c1a068c2d029e5a06236b /application | |
| parent | 7ea1d68244fdae1e7672fb84199ee71e168b31ca (diff) | |
| download | MultiMC-360d877abf44324ba6cef2340381384a8da71060.tar MultiMC-360d877abf44324ba6cef2340381384a8da71060.tar.gz MultiMC-360d877abf44324ba6cef2340381384a8da71060.tar.lz MultiMC-360d877abf44324ba6cef2340381384a8da71060.tar.xz MultiMC-360d877abf44324ba6cef2340381384a8da71060.zip | |
GH-2103 Take CMAKE_INSTALL_PREFIX into account in MULTIMC_JARS_LOCATION
When installing MultiMC with the lin-system layout and specifying an
install prefix that is not the empty string, then MultiMC looks for its
Jars in the wrong location. Fix this by appending CMAKE_INSTALL_PREFIX.
Diffstat (limited to 'application')
| -rw-r--r-- | application/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/application/CMakeLists.txt b/application/CMakeLists.txt index a77e03d4..c7c31e89 100644 --- a/application/CMakeLists.txt +++ b/application/CMakeLists.txt @@ -404,7 +404,7 @@ elseif(MultiMC_LAYOUT_REAL STREQUAL "lin-system") MESSAGE(STATUS "Compiling for linux system with ${MultiMC_SHARE_DEST_DIR} and MULTIMC_LINUX_DATADIR") set_target_properties(MultiMC PROPERTIES OUTPUT_NAME ${MultiMC_APP_BINARY_NAME}) - target_compile_definitions(MultiMC PRIVATE "-DMULTIMC_JARS_LOCATION=/${MultiMC_SHARE_DEST_DIR}/jars" "-DMULTIMC_LINUX_DATADIR" + target_compile_definitions(MultiMC PRIVATE "-DMULTIMC_JARS_LOCATION=${CMAKE_INSTALL_PREFIX}/${MultiMC_SHARE_DEST_DIR}/jars" "-DMULTIMC_LINUX_DATADIR" ) # install as bundle with no dependencies included |