Skip to content

Commit

Permalink
Take CMAKE_INSTALL_PREFIX into account in MULTIMC_JARS_LOCATION
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
cpreh authored and peterix committed Jan 16, 2018
1 parent 7ea1d68 commit c5452c5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion application/CMakeLists.txt
Expand Up @@ -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
Expand Down

0 comments on commit c5452c5

Please sign in to comment.