diff options
| author | Forkk <forkk@forkk.net> | 2014-01-08 21:50:58 -0600 |
|---|---|---|
| committer | Forkk <forkk@forkk.net> | 2014-01-08 21:50:58 -0600 |
| commit | 0b1e0221f0389c94e863e55761905e2192a57c71 (patch) | |
| tree | b0d238789631c433bf32678c89d950420650c7ac /CMakeLists.txt | |
| parent | 06b5fa5dccdfc54496cd79e6eba6d025bc6e1204 (diff) | |
| parent | c51a993ff741074ac88bbc901ebfad9da636eeaa (diff) | |
| download | MultiMC-0b1e0221f0389c94e863e55761905e2192a57c71.tar MultiMC-0b1e0221f0389c94e863e55761905e2192a57c71.tar.gz MultiMC-0b1e0221f0389c94e863e55761905e2192a57c71.tar.lz MultiMC-0b1e0221f0389c94e863e55761905e2192a57c71.tar.xz MultiMC-0b1e0221f0389c94e863e55761905e2192a57c71.zip | |
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 274e4155..ea44f375 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -532,13 +532,6 @@ ENDIF() ################################ COMPILE ################################ -# ICNS file for OS X -IF(APPLE) - SET(MACOSX_BUNDLE_ICON_FILE MultiMC.icns) - SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_SOURCE_DIR}/MultiMC.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources) - SET(MULTIMC_SOURCES ${MULTIMC_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/MultiMC.icns) -ENDIF(APPLE) - # Link additional libraries IF(WIN32) SET(MultiMC_LINK_ADDITIONAL_LIBS ${MultiMC_LINK_ADDITIONAL_LIBS} @@ -667,6 +660,11 @@ FILE(WRITE \"\${CMAKE_INSTALL_PREFIX}/${QTCONF_DEST_DIR}/qt.conf\" \"\") COMPONENT Runtime ) +# ICNS file for OS X +IF(APPLE) + INSTALL(FILES MultiMC.icns DESTINATION MultiMC.app/Contents/Resources) +ENDIF() + CONFIGURE_FILE( "${CMAKE_CURRENT_SOURCE_DIR}/install_prereqs.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/install_prereqs.cmake" |