diff options
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 52 |
1 files changed, 44 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c8f84b28..bcb09f83 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -283,6 +283,8 @@ SET(MULTIMC_SOURCES # GUI - general utilities gui/GuiUtil.h gui/GuiUtil.cpp + gui/ColumnResizer.h + gui/ColumnResizer.cpp # GUI - windows gui/MainWindow.h @@ -313,11 +315,23 @@ SET(MULTIMC_SOURCES gui/pages/OtherLogsPage.cpp gui/pages/OtherLogsPage.h + # GUI - global settings pages + gui/pages/global/AccountListPage.cpp + gui/pages/global/AccountListPage.h + gui/pages/global/ExternalToolsPage.cpp + gui/pages/global/ExternalToolsPage.h + gui/pages/global/JavaPage.cpp + gui/pages/global/JavaPage.h + gui/pages/global/MinecraftPage.cpp + gui/pages/global/MinecraftPage.h + gui/pages/global/MultiMCPage.cpp + gui/pages/global/MultiMCPage.h + gui/pages/global/ProxyPage.cpp + gui/pages/global/ProxyPage.h + # GUI - dialogs gui/dialogs/AboutDialog.cpp gui/dialogs/AboutDialog.h - gui/dialogs/AccountListDialog.cpp - gui/dialogs/AccountListDialog.h gui/dialogs/AccountSelectDialog.cpp gui/dialogs/AccountSelectDialog.h gui/dialogs/CopyInstanceDialog.cpp @@ -342,8 +356,6 @@ SET(MULTIMC_SOURCES gui/pagedialog/PageDialog.h gui/dialogs/ProgressDialog.cpp gui/dialogs/ProgressDialog.h - gui/dialogs/SettingsDialog.cpp - gui/dialogs/SettingsDialog.h gui/dialogs/UpdateDialog.cpp gui/dialogs/UpdateDialog.h gui/dialogs/VersionSelectDialog.cpp @@ -427,6 +439,9 @@ SET(MULTIMC_SOURCES # RW lock protected map logic/RWStorage.h + # A variable that has an implicit default value and keeps track of changes + logic/DefaultVariable.h + # network stuffs logic/net/NetAction.h logic/net/MD5EtagDownload.h @@ -493,6 +508,7 @@ SET(MULTIMC_SOURCES logic/OneSixInstance_p.h # OneSix version json infrastructure + logic/minecraft/GradleSpecifier.h logic/minecraft/InstanceVersion.cpp logic/minecraft/InstanceVersion.h logic/minecraft/JarMod.cpp @@ -641,8 +657,15 @@ SET(MULTIMC_UIS gui/pages/ScreenshotsPage.ui gui/pages/OtherLogsPage.ui + # Global settings pages + gui/pages/global/AccountListPage.ui + gui/pages/global/ExternalToolsPage.ui + gui/pages/global/JavaPage.ui + gui/pages/global/MinecraftPage.ui + gui/pages/global/MultiMCPage.ui + gui/pages/global/ProxyPage.ui + # Dialogs - gui/dialogs/SettingsDialog.ui gui/dialogs/CopyInstanceDialog.ui gui/dialogs/NewInstanceDialog.ui gui/dialogs/AboutDialog.ui @@ -650,7 +673,6 @@ SET(MULTIMC_UIS gui/dialogs/LwjglSelectDialog.ui gui/dialogs/ProgressDialog.ui gui/dialogs/IconPickerDialog.ui - gui/dialogs/AccountListDialog.ui gui/dialogs/AccountSelectDialog.ui gui/dialogs/EditAccountDialog.ui gui/dialogs/LoginDialog.ui @@ -760,7 +782,13 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInf COMPONENT Runtime REGEX "tga|tiff|mng" EXCLUDE ) - + # Icon engines + install( + DIRECTORY "${QT_PLUGINS_DIR}/iconengines" + DESTINATION ${PLUGIN_DEST_DIR} + COMPONENT Runtime + REGEX "fontawesome" EXCLUDE + ) # Platform plugins install( DIRECTORY "${QT_PLUGINS_DIR}/platforms" @@ -778,7 +806,15 @@ else() REGEX "d\\." EXCLUDE REGEX "_debug\\." EXCLUDE ) - + # Icon engines + install( + DIRECTORY "${QT_PLUGINS_DIR}/iconengines" + DESTINATION ${PLUGIN_DEST_DIR} + COMPONENT Runtime + REGEX "fontawesome" EXCLUDE + REGEX "d\\." EXCLUDE + REGEX "_debug\\." EXCLUDE + ) # Platform plugins install( DIRECTORY "${QT_PLUGINS_DIR}/platforms" |