From 418251bd8668ea013caf3980281f75b625d41260 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sun, 28 Jan 2018 19:04:39 +0100 Subject: [PATCH] NOISSUE use a variable for binary build definitions --- CMakeLists.txt | 2 +- application/CMakeLists.txt | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cc5ef0b19..acfb7512f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -203,7 +203,7 @@ elseif(MultiMC_LAYOUT_REAL STREQUAL "lin-system") set(LIBRARY_DEST_DIR ${MultiMC_LIBRARY_DEST_DIR}) MESSAGE(STATUS "Compiling for linux system with ${MultiMC_SHARE_DEST_DIR} and MULTIMC_LINUX_DATADIR") - target_compile_definitions(MultiMC PRIVATE "-DMULTIMC_JARS_LOCATION=${CMAKE_INSTALL_PREFIX}/${JARS_DEST_DIR}" "-DMULTIMC_LINUX_DATADIR") + SET(MultiMC_APP_BINARY_DEFS "-DMULTIMC_JARS_LOCATION=${CMAKE_INSTALL_PREFIX}/${JARS_DEST_DIR}" "-DMULTIMC_LINUX_DATADIR") # install as bundle with no dependencies included set(INSTALL_BUNDLE "nodeps") diff --git a/application/CMakeLists.txt b/application/CMakeLists.txt index 37fc7a32a..aa09efbb3 100644 --- a/application/CMakeLists.txt +++ b/application/CMakeLists.txt @@ -266,6 +266,9 @@ endif() if(DEFINED MultiMC_BINARY_RPATH) SET_TARGET_PROPERTIES(MultiMC PROPERTIES INSTALL_RPATH "${MultiMC_BINARY_RPATH}") endif() +if(DEFINED MultiMC_APP_BINARY_DEFS) + target_compile_definitions(MultiMC PRIVATE ${MultiMC_APP_BINARY_DEFS}) +endif() install(TARGETS MultiMC BUNDLE DESTINATION ${BUNDLE_DEST_DIR} COMPONENT Runtime