CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GH-2291 Fix build with Qt 5.11+

Browse Source
This commit is contained in:
Sergey Shatunov
2018-06-01 21:20:33 +07:00
parent f0ff2db4e1
commit 4d68c1b509
19 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/LocalPeer/CMakeLists.txt
View File

@ -26,4 +26,4 @@ endif()
add_library(LocalPeer STATIC ${SINGLE_SOURCES})
target_include_directories(LocalPeer PUBLIC include)
qt5_use_modules(LocalPeer Core Network)
target_link_libraries(LocalPeer Qt5::Core Qt5::Network)

3
libraries/classparser/CMakeLists.txt
View File

@ -38,5 +38,4 @@ add_definitions(-DCLASSPARSER_LIBRARY)
add_library(MultiMC_classparser STATIC ${CLASSPARSER_SOURCES} ${CLASSPARSER_HEADERS})
target_include_directories(MultiMC_classparser PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include")
target_link_libraries(MultiMC_classparser MultiMC_quazip)
qt5_use_modules(MultiMC_classparser Core)
target_link_libraries(MultiMC_classparser MultiMC_quazip Qt5::Core)

2
libraries/ganalytics/CMakeLists.txt
View File

@ -12,6 +12,6 @@ include/ganalytics.h
)
add_library(ganalytics STATIC ${ganalytics_SOURCES})
qt5_use_modules(ganalytics Core Gui Network)
target_link_libraries(ganalytics Qt5::Core Qt5::Gui Qt5::Network)
target_include_directories(ganalytics PUBLIC include)
target_link_libraries(ganalytics systeminfo)

2
libraries/iconfix/CMakeLists.txt
View File

@ -15,7 +15,7 @@ internal/qiconloader_p.h
add_library(MultiMC_iconfix SHARED ${ICONFIX_SOURCES})
target_include_directories(MultiMC_iconfix PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_CURRENT_BINARY_DIR}" )
qt5_use_modules(MultiMC_iconfix Core Widgets)
target_link_libraries(MultiMC_iconfix Qt5::Core Qt5::Widgets)
set_target_properties(MultiMC_iconfix PROPERTIES CXX_VISIBILITY_PRESET hidden VISIBILITY_INLINES_HIDDEN 1)
generate_export_header(MultiMC_iconfix)

2
libraries/quazip

Submodule libraries/quazip updated: 683e2ec8ad...469b97b618

2
libraries/rainbow/CMakeLists.txt
View File

@ -12,7 +12,7 @@ add_definitions(-DRAINBOW_LIBRARY)
add_library(MultiMC_rainbow SHARED ${RAINBOW_SOURCES})
target_include_directories(MultiMC_rainbow PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include")
qt5_use_modules(MultiMC_rainbow Core Gui)
target_link_libraries(MultiMC_rainbow Qt5::Core Qt5::Gui)
# Install it
install(

2
libraries/systeminfo/CMakeLists.txt
View File

@ -19,7 +19,7 @@ elseif (UNIX)
endif()
add_library(systeminfo STATIC ${systeminfo_SOURCES})
qt5_use_modules(systeminfo Core Gui Network)
target_link_libraries(systeminfo Qt5::Core Qt5::Gui Qt5::Network)
target_include_directories(systeminfo PUBLIC include)
include (UnitTest)