diff options
| author | Orochimarufan <orochimarufan.x3@gmail.com> | 2013-10-18 18:42:41 +0200 |
|---|---|---|
| committer | Orochimarufan <orochimarufan.x3@gmail.com> | 2013-10-18 18:43:19 +0200 |
| commit | 78882ff6b13ea8c5e7c14bee51c87f199e9c8a20 (patch) | |
| tree | fda586f881ed78256a00937c17d0992f261a6b52 /CMakeLists.txt | |
| parent | 205570be32b5cbd40eeb2b7e2d8d4fe116b07f64 (diff) | |
| download | MultiMC-78882ff6b13ea8c5e7c14bee51c87f199e9c8a20.tar MultiMC-78882ff6b13ea8c5e7c14bee51c87f199e9c8a20.tar.gz MultiMC-78882ff6b13ea8c5e7c14bee51c87f199e9c8a20.tar.lz MultiMC-78882ff6b13ea8c5e7c14bee51c87f199e9c8a20.tar.xz MultiMC-78882ff6b13ea8c5e7c14bee51c87f199e9c8a20.zip | |
Fix MainWindow Icon; Fix WM_CLASS issue; now links QX11Extras and libxcb on linux
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 64823772..b7dd6ea3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -350,6 +350,15 @@ IF(WIN32) SET(MULTIMC_RCS multimc.rc) ENDIF() +####### X11 Stuff ####### +IF(UNIX AND NOT APPLE) + SET(MultiMC_QT_ADDITIONAL_MODULES ${MultiMC_QT_ADDITIONAL_MODULES} X11Extras) + SET(MultiMC_LINK_ADDITIONAL_LIBS ${MultiMC_LINK_ADDITIONAL_LIBS} xcb) + LIST(APPEND MULTIMC_SOURCES gui/platform_x11.cpp) +ELSE() + LIST(APPEND MULTIMC_SOURCES gui/platform_other.cpp) +ENDIF() + ################################ COMPILE ################################ @@ -380,7 +389,7 @@ ADD_EXECUTABLE(MultiMC MACOSX_BUNDLE WIN32 # Link TARGET_LINK_LIBRARIES(MultiMC xz-embedded unpack200 quazip libUtil libSettings libGroupView ${MultiMC_LINK_ADDITIONAL_LIBS}) -QT5_USE_MODULES(MultiMC Core Widgets Network Xml) +QT5_USE_MODULES(MultiMC Core Widgets Network Xml ${MultiMC_QT_ADDITIONAL_MODULES}) ADD_DEPENDENCIES(MultiMC MultiMCLauncher) option(BUILD_KEYRING_TEST "Build the simple keyring test binary" OFF) |