diff options
| author | Andrew <forkk@forkk.net> | 2013-03-13 13:25:24 -0500 |
|---|---|---|
| committer | Andrew <forkk@forkk.net> | 2013-03-13 13:25:24 -0500 |
| commit | 8864c7ebdc7c6591f17ed65a474113b66e974488 (patch) | |
| tree | 4a8ad6a1e771834f2060fcffd77e2dc820fb5cab /CMakeLists.txt | |
| parent | f0cb300d04aac77fbe6e03dfdbe201f5f834d886 (diff) | |
| parent | 46f93311afc9f1e2afc306f63cee0e4f462758e2 (diff) | |
| download | MultiMC-8864c7ebdc7c6591f17ed65a474113b66e974488.tar MultiMC-8864c7ebdc7c6591f17ed65a474113b66e974488.tar.gz MultiMC-8864c7ebdc7c6591f17ed65a474113b66e974488.tar.lz MultiMC-8864c7ebdc7c6591f17ed65a474113b66e974488.tar.xz MultiMC-8864c7ebdc7c6591f17ed65a474113b66e974488.zip | |
Merge branch 'master' of git://github.com/peterix/MultiMC5
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9aa75f4d..cf6e1aab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,6 +71,10 @@ include_directories(${LIBSETTINGS_INCLUDE_DIR}) add_subdirectory(libmultimc) include_directories(${LIBMULTIMC_INCLUDE_DIR}) +# Add the group view library. +add_subdirectory(libgroupview) +include_directories(${LIBGROUPVIEW_INCLUDE_DIR}) + # Add the stdinstance plugin. add_subdirectory(plugins/stdinstance) @@ -166,6 +170,8 @@ gui/taskdialog.h gui/browserdialog.h gui/aboutdialog.h gui/consolewindow.h +gui/instancemodel.h +gui/instancedelegate.h multimc_pragma.h @@ -192,6 +198,8 @@ gui/taskdialog.cpp gui/browserdialog.cpp gui/aboutdialog.cpp gui/consolewindow.cpp +gui/instancemodel.cpp +gui/instancedelegate.cpp java/javautils.cpp java/annotations.cpp @@ -222,7 +230,7 @@ ENDIF() # ICNS file for OS X IF(APPLE) - SET(MACOSX_BUNDLE_ICON_FILE MultiMC.icns) + SET(MACOSX_BUNDLE_ICON_FILE MultiMC.icns) SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_SOURCE_DIR}/MultiMC.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources) SET(MULTIMC_SOURCES ${MULTIMC_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/MultiMC.icns) ENDIF(APPLE) @@ -248,9 +256,9 @@ ADD_EXECUTABLE(MultiMC MACOSX_BUNDLE WIN32 # Link QT5_USE_MODULES(MultiMC Widgets Network WebKitWidgets) TARGET_LINK_LIBRARIES(MultiMC quazip patchlib -libUtil libSettings libMultiMC +libUtil libSettings libMultiMC libGroupView ${MultiMC_LINK_ADDITIONAL_LIBS}) -ADD_DEPENDENCIES(MultiMC MultiMCLauncher libUtil libSettings libMultiMC) +ADD_DEPENDENCIES(MultiMC MultiMCLauncher libUtil libSettings libMultiMC libGroupView) ################################ INSTALLATION AND PACKAGING ################################ |