diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-09-06 21:01:23 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-09-06 21:01:23 +0200 |
| commit | b00e63dbe8d0acaae503e63d614ee20b9e9ede2e (patch) | |
| tree | adc9a8442d20fe717879224036ee0b768dfa392d /CMakeLists.txt | |
| parent | 20cb97a35af5097e9d3b2062c0dfcb5f2e5fff5c (diff) | |
| download | MultiMC-b00e63dbe8d0acaae503e63d614ee20b9e9ede2e.tar MultiMC-b00e63dbe8d0acaae503e63d614ee20b9e9ede2e.tar.gz MultiMC-b00e63dbe8d0acaae503e63d614ee20b9e9ede2e.tar.lz MultiMC-b00e63dbe8d0acaae503e63d614ee20b9e9ede2e.tar.xz MultiMC-b00e63dbe8d0acaae503e63d614ee20b9e9ede2e.zip | |
More sync from quickmods
Also a small VersionSelectDialog refactor
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d11d21f9..47c5c9da 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,6 +48,7 @@ find_package(Qt5Network REQUIRED) find_package(Qt5Test REQUIRED) find_package(Qt5Xml REQUIRED) find_package(Qt5LinguistTools REQUIRED) +find_package(Qt5WebKitWidgets REQUIRED) include_directories( ${Qt5Core_INCLUDE_DIRS} @@ -186,6 +187,12 @@ else() set(MultiMC_UPDATER_FORCE_LOCAL_value "false") endif() +#### For QuickMods +option(MultiMC_WEBKIT_INSPECTOR "Enable the QWebInspector for debugging" OFF) +if(MultiMC_WEBKIT_INSPECTOR) + add_definitions(-DWEBKIT_INSPECTOR) +endif() + #### Custom target to just print the version. add_custom_target(version echo "Version: ${MultiMC_VERSION_STRING}") @@ -257,6 +264,10 @@ include_directories(${LIBUTIL_INCLUDE_DIR}) # Add the updater add_subdirectory(mmc_updater) +# Add the GUI -> Logic connection header +add_subdirectory(depends/LogicalGui) +include_directories(${LOGICALGUI_INCLUDE_DIR}) + ################################ FILES ################################ ######## Sources and headers ######## @@ -744,9 +755,9 @@ add_executable(MultiMC MACOSX_BUNDLE WIN32 main.cpp ${MULTIMC_RCS}) # Link target_link_libraries(MultiMC MultiMC_common) -target_link_libraries(MultiMC_common xz-embedded unpack200 quazip libUtil ${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}) +target_link_libraries(MultiMC_common xz-embedded unpack200 quazip libUtil LogicalGui ${MultiMC_LINK_ADDITIONAL_LIBS}) +qt5_use_modules(MultiMC Core Widgets Network Xml Concurrent WebKitWidgets ${MultiMC_QT_ADDITIONAL_MODULES}) +qt5_use_modules(MultiMC_common Core Widgets Network Xml Concurrent WebKitWidgets ${MultiMC_QT_ADDITIONAL_MODULES}) ################################ INSTALLATION AND PACKAGING ################################ |