0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOISSUE eliminate qt5_use_modules from build

Browse Source
This commit is contained in:
Petr Mrázek
2015-03-16 08:43:00 +01:00
parent 8be865fb2a
commit 405833bbbe
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
CMakeLists.txt
View File

@@ -711,7 +711,8 @@ endif()
####### X11 Stuff ####### ####### X11 Stuff #######
if(UNIX AND NOT APPLE) if(UNIX AND NOT APPLE)
set(MultiMC_QT_ADDITIONAL_MODULES ${MultiMC_QT_ADDITIONAL_MODULES} X11Extras) find_package(Qt5X11Extras REQUIRED)
set(MultiMC_LINK_ADDITIONAL_LIBS ${MultiMC_LINK_ADDITIONAL_LIBS} Qt5::X11Extras)
set(MultiMC_LINK_ADDITIONAL_LIBS ${MultiMC_LINK_ADDITIONAL_LIBS} xcb) set(MultiMC_LINK_ADDITIONAL_LIBS ${MultiMC_LINK_ADDITIONAL_LIBS} xcb)
list(APPEND MULTIMC_SOURCES gui/Platform_X11.cpp) list(APPEND MULTIMC_SOURCES gui/Platform_X11.cpp)
else() else()
@@ -742,9 +743,15 @@ add_executable(MultiMC MACOSX_BUNDLE WIN32 main.cpp ${MULTIMC_RCS})
# Link # Link
target_link_libraries(MultiMC MultiMC_common) target_link_libraries(MultiMC MultiMC_common)
target_link_libraries(MultiMC_common xz-embedded unpack200 iconfix libUtil LogicalGui ${QUAZIP_LIBRARIES} Qt5::Core ${MultiMC_LINK_ADDITIONAL_LIBS})
qt5_use_modules(MultiMC Core Widgets Network Xml Concurrent WebKitWidgets ${MultiMC_QT_ADDITIONAL_MODULES}) target_link_libraries(MultiMC_common xz-embedded unpack200 iconfix libUtil LogicalGui
qt5_use_modules(MultiMC_common Core Widgets Network Xml Concurrent WebKitWidgets ${MultiMC_QT_ADDITIONAL_MODULES}) ${QUAZIP_LIBRARIES} Qt5::Core Qt5::Xml Qt5::Widgets Qt5::Network Qt5::Concurrent Qt5::WebKitWidgets
${MultiMC_LINK_ADDITIONAL_LIBS}
)
target_link_libraries(MultiMC_common Qt5::Core Qt5::Widgets Qt5::Network Qt5::Concurrent Qt5::WebKitWidgets
${MultiMC_LINK_ADDITIONAL_LIBS}
)
add_dependencies(MultiMC_common QuaZIP) add_dependencies(MultiMC_common QuaZIP)