diff options
| author | Petr Mrázek <peterix@gmail.com> | 2017-05-05 23:09:26 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2017-05-05 23:09:26 +0200 |
| commit | e5147e6b6508ee91e2c5e4f93125220042489ad0 (patch) | |
| tree | cc21377fa80e2db73d4c144193a51722de690dff /application | |
| parent | 9d4c188fd47dbe593c216af5538011e694efb200 (diff) | |
| download | MultiMC-e5147e6b6508ee91e2c5e4f93125220042489ad0.tar MultiMC-e5147e6b6508ee91e2c5e4f93125220042489ad0.tar.gz MultiMC-e5147e6b6508ee91e2c5e4f93125220042489ad0.tar.lz MultiMC-e5147e6b6508ee91e2c5e4f93125220042489ad0.tar.xz MultiMC-e5147e6b6508ee91e2c5e4f93125220042489ad0.zip | |
NOISSUE remove (assumed) obsolete parts of the application cmake script
Diffstat (limited to 'application')
| -rw-r--r-- | application/CMakeLists.txt | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/application/CMakeLists.txt b/application/CMakeLists.txt index 7722a091..97b2e701 100644 --- a/application/CMakeLists.txt +++ b/application/CMakeLists.txt @@ -328,16 +328,6 @@ qt5_add_resources(MULTIMC_RESOURCES ${MULTIMC_QRCS}) add_executable(MultiMC MACOSX_BUNDLE WIN32 ${MULTIMC_SOURCES} ${MULTIMC_UI} ${MULTIMC_RESOURCES} ${MULTIMC_RCS}) target_link_libraries(MultiMC MultiMC_gui ${QUAZIP_LIBRARIES} hoedown MultiMC_rainbow LocalPeer ganalytics) -if(APPLE) -find_library(OSX_CORE_FOUNDATION CoreFoundation) -find_library(OSX_SECURITY Security) -if (NOT OSX_CORE_FOUNDATION OR NOT OSX_SECURITY) - message(FATAL_ERROR "OSX framerworks not found: CoreFoundation, Security") -endif() - -target_link_libraries(MultiMC ${OSX_CORE_FOUNDATION} ${OSX_SECURITY}) -endif() - ################################ INSTALLATION AND PACKAGING ################################ ######## Install ######## @@ -420,30 +410,8 @@ else() REGEX "d\\." EXCLUDE REGEX "_debug\\." EXCLUDE ) - if(APPLE) - # Accessible plugin to make buttons look decent on osx - if("${Qt5Core_VERSION_STRING}" VERSION_LESS "5.4.0") - message(STATUS "Packaging the Qt accessible plugins because we're on Qt ${Qt5Core_VERSION_STRING}") - install( - DIRECTORY "${QT_PLUGINS_DIR}/accessible" - DESTINATION ${PLUGIN_DEST_DIR} - COMPONENT Runtime - REGEX "quick" EXCLUDE - REGEX "d\\." EXCLUDE - REGEX "_debug\\." EXCLUDE - ) - endif() - endif() endif() -# qtconf -install( - CODE " -file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${QTCONF_DEST_DIR}/qt.conf\" \"\") -" - COMPONENT Runtime -) - # ICNS file for OS X if(APPLE) install(FILES resources/MultiMC.icns DESTINATION MultiMC.app/Contents/Resources) @@ -455,31 +423,3 @@ configure_file( @ONLY ) install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/install_prereqs.cmake" COMPONENT Runtime) - - - -######## Package ######## - -# Package with CPack -if(UNIX) - if(APPLE) - set(CPACK_GENERATOR "ZIP") - else() - set(CPACK_GENERATOR "TGZ") - endif() -elseif(WIN32) - set(CPACK_GENERATOR "ZIP") -endif() -set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 0) - -set(CPACK_PACKAGE_NAME "MultiMC 5") -set(CPACK_PACKAGE_VENDOR "") -set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MultiMC - Minecraft launcher and management tool.") -set(CPACK_PACKAGE_VERSION "${MultiMC_VERSION_MAJOR}.${MultiMC_VERSION_MINOR}.${MultiMC_VERSION_REV}.${MultiMC_VERSION_BUILD}") -set(CPACK_PACKAGE_VERSION_MAJOR ${MultiMC_VERSION_MAJOR}) -set(CPACK_PACKAGE_VERSION_MINOR ${MultiMC_VERSION_MINOR}) -set(CPACK_PACKAGE_VERSION_PATCH ${MultiMC_VERSION_REV}) - -set(CPACK_PACKAGE_FILE_NAME "MultiMC") - -include(CPack) |