summaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2014-01-11 02:17:51 +0100
committerPetr Mrázek <peterix@gmail.com>2014-01-11 02:17:51 +0100
commitd52079e73464dcdcc9b15862c9a610634a9db5a3 (patch)
tree90416bca5742ee2239809b0d80ff6f7f1d47a5c9 /CMakeLists.txt
parent43a39a3bfbffa2997cf8ca5126ee3ac5157f62c8 (diff)
downloadMultiMC-d52079e73464dcdcc9b15862c9a610634a9db5a3.tar
MultiMC-d52079e73464dcdcc9b15862c9a610634a9db5a3.tar.gz
MultiMC-d52079e73464dcdcc9b15862c9a610634a9db5a3.tar.lz
MultiMC-d52079e73464dcdcc9b15862c9a610634a9db5a3.tar.xz
MultiMC-d52079e73464dcdcc9b15862c9a610634a9db5a3.zip
No more generated resources.
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt5
1 files changed, 1 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cab0b51c..dcb4cbaa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -559,12 +559,10 @@ ENDIF(MultiMC_CODE_COVERAGE)
# Qt 5 stuff
QT5_WRAP_UI(MULTIMC_UI ${MULTIMC_UIS})
-CONFIGURE_FILE(generated.qrc.in generated.qrc)
-QT5_ADD_RESOURCES(GENERATED_QRC ${CMAKE_CURRENT_BINARY_DIR}/generated.qrc)
QT5_ADD_RESOURCES(GRAPHICS_QRC graphics.qrc)
# Add common library
-ADD_LIBRARY(MultiMC_common STATIC ${MULTIMC_SOURCES} ${MULTIMC_UI} ${GENERATED_QRC} ${GRAPHICS_QRC})
+ADD_LIBRARY(MultiMC_common STATIC ${MULTIMC_SOURCES} ${MULTIMC_UI} ${GRAPHICS_QRC})
# Add executable
ADD_EXECUTABLE(MultiMC MACOSX_BUNDLE WIN32 main.cpp ${MULTIMC_RCS})
@@ -574,7 +572,6 @@ TARGET_LINK_LIBRARIES(MultiMC MultiMC_common)
TARGET_LINK_LIBRARIES(MultiMC_common xz-embedded unpack200 quazip libUtil libSettings libGroupView ${MultiMC_LINK_ADDITIONAL_LIBS})
QT5_USE_MODULES(MultiMC Core Widgets Network Xml Concurrent ${MultiMC_QT_ADDITIONAL_MODULES})
QT5_USE_MODULES(MultiMC_common Core Widgets Network Xml Concurrent ${MultiMC_QT_ADDITIONAL_MODULES})
-ADD_DEPENDENCIES(MultiMC_common MultiMCLauncher JavaCheck)
################################ INSTALLATION AND PACKAGING ################################