diff --git CMakeLists.txt CMakeLists.txt index d0289643..d401ec27 100644 --- CMakeLists.txt +++ CMakeLists.txt @@ -132,7 +132,7 @@ if(MultiMC_LAYOUT_REAL STREQUAL "mac-bundle") set(BUNDLE_DEST_DIR ".") # Apps to bundle - set(APPS "\${CMAKE_INSTALL_PREFIX}/MultiMC.app") + set(APPS "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/MultiMC.app") # Mac bundle settings set(MACOSX_BUNDLE_BUNDLE_NAME "MultiMC") @@ -147,6 +147,8 @@ if(MultiMC_LAYOUT_REAL STREQUAL "mac-bundle") # directories to look for dependencies set(DIRS ${QT_LIBS_DIR} ${QT_LIBEXECS_DIR} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) + SET(MultiMC_APP_BINARY_DEFS "-DMULTIMC_LINUX_DATADIR") + # install as bundle set(INSTALL_BUNDLE "full") diff --git application/CMakeLists.txt application/CMakeLists.txt index 94ba56d0..cb08a6e3 100644 --- application/CMakeLists.txt +++ application/CMakeLists.txt @@ -320,7 +320,7 @@ install(TARGETS MultiMC if(INSTALL_BUNDLE STREQUAL "full") # Add qt.conf - this makes Qt stop looking for things outside the bundle install( - CODE "file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${RESOURCES_DEST_DIR}/qt.conf\" \" \")" + CODE "file(WRITE \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${RESOURCES_DEST_DIR}/qt.conf\" \" \")" COMPONENT Runtime ) # Bundle plugins @@ -378,10 +378,4 @@ if(INSTALL_BUNDLE STREQUAL "full") REGEX "\\.dSYM" EXCLUDE ) endif() - configure_file( - "${CMAKE_CURRENT_SOURCE_DIR}/install_prereqs.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/install_prereqs.cmake" - @ONLY - ) - install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/install_prereqs.cmake" COMPONENT Runtime) endif()