diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-08-25 22:48:41 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-08-25 22:48:41 +0200 |
| commit | f0990fae4bc6e54837764c0ded1461b9f1770401 (patch) | |
| tree | 619dd1c5007d902e2d349bb42e3f66454596713a /CMakeLists.txt | |
| parent | d884f849d60db44f05a6a6b22f4ffcf520900389 (diff) | |
| download | MultiMC-f0990fae4bc6e54837764c0ded1461b9f1770401.tar MultiMC-f0990fae4bc6e54837764c0ded1461b9f1770401.tar.gz MultiMC-f0990fae4bc6e54837764c0ded1461b9f1770401.tar.lz MultiMC-f0990fae4bc6e54837764c0ded1461b9f1770401.tar.xz MultiMC-f0990fae4bc6e54837764c0ded1461b9f1770401.zip | |
Many improvements
PermGen can be tweaked from the settings menu
Groups are saved on change/exit
Install target is no longer completely broken
All the deplibs are now static
Added notes dialog
Fixed ini file format support (can save strings with newlines, tabs. UTF-8 is explicitly used!)
Rename button now uses line breaks so it doesn't grow ever wider (Added a custom tool button subclass)
There is now a CAT button. Meow.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 49 |
1 files changed, 27 insertions, 22 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f6520333..2fead64c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -173,6 +173,8 @@ gui/instancesettings.h gui/IconPickerDialog.h gui/LegacyModEditDialog.h gui/ModListView.h +gui/LabeledToolButton.h +gui/EditNotesDialog.h # Base classes and infrastructure logic/InstanceVersion.h @@ -242,6 +244,8 @@ gui/instancesettings.cpp gui/IconPickerDialog.cpp gui/LegacyModEditDialog.cpp gui/ModListView.cpp +gui/LabeledToolButton.cpp +gui/EditNotesDialog.cpp # Base classes and infrastructure logic/InstanceFactory.cpp @@ -298,6 +302,7 @@ gui/lwjglselectdialog.ui gui/instancesettings.ui gui/IconPickerDialog.ui gui/LegacyModEditDialog.ui +gui/EditNotesDialog.ui ) @@ -405,7 +410,7 @@ INSTALL(TARGETS MultiMC ELSE() INSTALL(TARGETS MultiMC BUNDLE DESTINATION . COMPONENT Runtime - RUNTIME DESTINATION bin COMPONENT Runtime + RUNTIME DESTINATION . COMPONENT Runtime ) ENDIF() ENDIF() @@ -413,27 +418,27 @@ ENDIF() #### Plugins #### -# Image formats -INSTALL(DIRECTORY "${QT_PLUGINS_DIR}/imageformats" DESTINATION ${PLUGIN_DEST_DIR} COMPONENT Runtime) - -# Platform plugins -INSTALL(DIRECTORY "${QT_PLUGINS_DIR}/platforms" DESTINATION ${PLUGIN_DEST_DIR} COMPONENT Runtime) - -# qtconf -INSTALL(CODE " - FILE(WRITE \"\${CMAKE_INSTALL_PREFIX}/${QTCONF_DEST_DIR}/qt.conf\" \"\") - " COMPONENT Runtime) - - -# Dirs to look for dependencies. -SET(DIRS "${QT_LIBRARY_DIRS}") - -INSTALL(CODE " - file(GLOB_RECURSE QTPLUGINS - \"\${CMAKE_INSTALL_PREFIX}/${PLUGIN_DEST_DIR}/plugins/*${CMAKE_SHARED_LIBRARY_SUFFIX}\") - include(BundleUtilities) - fixup_bundle(\"${APPS}\" \"\${QTPLUGINS}\" \"${DIRS}\") - " COMPONENT Runtime) +# # Image formats +# INSTALL(DIRECTORY "${QT_PLUGINS_DIR}/imageformats" DESTINATION ${PLUGIN_DEST_DIR} COMPONENT Runtime) +# +# # Platform plugins +# INSTALL(DIRECTORY "${QT_PLUGINS_DIR}/platforms" DESTINATION ${PLUGIN_DEST_DIR} COMPONENT Runtime) +# +# # qtconf +# INSTALL(CODE " +# FILE(WRITE \"\${CMAKE_INSTALL_PREFIX}/${QTCONF_DEST_DIR}/qt.conf\" \"\") +# " COMPONENT Runtime) +# +# +# # Dirs to look for dependencies. +# SET(DIRS "${QT_LIBRARY_DIRS}") +# +# INSTALL(CODE " +# file(GLOB_RECURSE QTPLUGINS +# \"\${CMAKE_INSTALL_PREFIX}/${PLUGIN_DEST_DIR}/plugins/*${CMAKE_SHARED_LIBRARY_SUFFIX}\") +# include(BundleUtilities) +# fixup_bundle(\"${APPS}\" \"\${QTPLUGINS}\" \"${DIRS}\") +# " COMPONENT Runtime) ######## Package ######## |