diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-09-28 18:25:55 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-09-28 18:25:55 +0200 |
| commit | 071ac459256a135759fd53d601d649c722e0e902 (patch) | |
| tree | 3e157d89e32b3b9b794489750a93bf7e374a5bb0 /CMakeLists.txt | |
| parent | d903b0f0ea4bbeb6a20771575295ea28795dc5d7 (diff) | |
| parent | 5c8def4eccc3ca591e8a94e57d9b9ead2cb2c381 (diff) | |
| download | MultiMC-071ac459256a135759fd53d601d649c722e0e902.tar MultiMC-071ac459256a135759fd53d601d649c722e0e902.tar.gz MultiMC-071ac459256a135759fd53d601d649c722e0e902.tar.lz MultiMC-071ac459256a135759fd53d601d649c722e0e902.tar.xz MultiMC-071ac459256a135759fd53d601d649c722e0e902.zip | |
Merge branch 'develop' of https://github.com/hyperfang8/MultiMC5 into develop
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index de8ca8b5..0537f461 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -358,7 +358,7 @@ QT5_USE_MODULES(MultiMC Widgets Network Xml) TARGET_LINK_LIBRARIES(MultiMC quazip lzma libUtil libSettings libGroupView ${MultiMC_LINK_ADDITIONAL_LIBS}) #ADD_DEPENDENCIES(MultiMC MultiMCLauncher libUtil libSettings libGroupView) - +ADD_DEPENDENCIES(MultiMC MultiMCLauncher) option(BUILD_KEYRING_TEST "Build the simple keyring test binary" OFF) IF(BUILD_KEYRING_TEST) |