From c5452c5eef2489754b4b74b095a5944b73a37da6 Mon Sep 17 00:00:00 2001 From: Carl Philipp Reh Date: Sat, 13 Jan 2018 15:50:56 +0100 Subject: [PATCH] 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. --- application/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/CMakeLists.txt b/application/CMakeLists.txt index a77e03d4db..c7c31e89a3 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