diff options
| author | hyperfang8 <hyperfang8@gmail.com> | 2013-09-28 11:00:34 +0200 |
|---|---|---|
| committer | hyperfang8 <hyperfang8@gmail.com> | 2013-09-28 11:00:34 +0200 |
| commit | 5c8def4eccc3ca591e8a94e57d9b9ead2cb2c381 (patch) | |
| tree | 4636c6af71f5b78be4aee3cfa1143ed73cd3a628 /CMakeLists.txt | |
| parent | 6f1278b607a12f80c1cdcdaf343f618a9b10ba95 (diff) | |
| download | MultiMC-5c8def4eccc3ca591e8a94e57d9b9ead2cb2c381.tar MultiMC-5c8def4eccc3ca591e8a94e57d9b9ead2cb2c381.tar.gz MultiMC-5c8def4eccc3ca591e8a94e57d9b9ead2cb2c381.tar.lz MultiMC-5c8def4eccc3ca591e8a94e57d9b9ead2cb2c381.tar.xz MultiMC-5c8def4eccc3ca591e8a94e57d9b9ead2cb2c381.zip | |
Disable pack200 and Enable MultiMCLauncher dep
I disable pack200 in cmake because it fails to compile.
I also renable MultiMCLauncher dep because resource file requires it.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ffa04b88..78087e16 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -69,7 +69,7 @@ add_subdirectory(depends/groupview) include_directories(${LIBGROUPVIEW_INCLUDE_DIR}) #pack 200 -add_subdirectory(depends/pack200) +#add_subdirectory(depends/pack200) ################################ SET UP BUILD OPTIONS ################################ @@ -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) |