summaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2013-06-30 22:39:57 +0200
committerPetr Mrázek <peterix@gmail.com>2013-06-30 22:39:57 +0200
commite49b81869832a83ae02580909608348c43895e7a (patch)
tree30be6967a0033beca4a686c97bca1da72397a0e6 /CMakeLists.txt
parent38fb702e7828ce61c6cc0e39985e8d665c960071 (diff)
downloadMultiMC-e49b81869832a83ae02580909608348c43895e7a.tar
MultiMC-e49b81869832a83ae02580909608348c43895e7a.tar.gz
MultiMC-e49b81869832a83ae02580909608348c43895e7a.tar.lz
MultiMC-e49b81869832a83ae02580909608348c43895e7a.tar.xz
MultiMC-e49b81869832a83ae02580909608348c43895e7a.zip
Add queued downloader, some super-minor UI tweaks in stuff that's not even visible yet.
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt21
1 files changed, 16 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 10308e18..e0a2123e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -268,13 +268,24 @@ libUtil libSettings libMultiMC libGroupView
${MultiMC_LINK_ADDITIONAL_LIBS})
ADD_DEPENDENCIES(MultiMC MultiMCLauncher libUtil libSettings libMultiMC libGroupView)
-IF(DEFINED MMC_KEYRING_TEST)
-# test.cpp
-ADD_EXECUTABLE(Test test.cpp)
-QT5_USE_MODULES(Test Core)
-TARGET_LINK_LIBRARIES(Test libUtil libSettings)
+
+option(BUILD_KEYRING_TEST "Build the simple keyring test binary" OFF)
+IF(BUILD_KEYRING_TEST)
+ # test.cpp
+ ADD_EXECUTABLE(Test test.cpp)
+ QT5_USE_MODULES(Test Core)
+ TARGET_LINK_LIBRARIES(Test libUtil libSettings)
+ENDIF()
+
+option(BUILD_ASSET_TEST "Build the asset sync test binary" OFF)
+IF(BUILD_ASSET_TEST)
+ # test.cpp
+ ADD_EXECUTABLE(AssetTest asset_test.cpp)
+ QT5_USE_MODULES(AssetTest Core Network)
+ TARGET_LINK_LIBRARIES(AssetTest libUtil libMultiMC libSettings)
ENDIF()
+
################################ INSTALLATION AND PACKAGING ################################
# use QtCreator's QTDIR var
IF(DEFINED ENV{QTDIR})