diff options
| author | Sergey Shatunov <me@prok.pw> | 2018-06-01 21:20:33 +0700 |
|---|---|---|
| committer | Sergey Shatunov <me@prok.pw> | 2018-06-02 17:22:43 +0700 |
| commit | 4d68c1b509cd289e9f02cbf258e69f2539349029 (patch) | |
| tree | 75ebfaae1e8c6b32babed0f89b18a5c62b06d503 /libraries | |
| parent | f0ff2db4e1a81bc941ea8b6ce43f7fb63d34547a (diff) | |
| download | MultiMC-4d68c1b509cd289e9f02cbf258e69f2539349029.tar MultiMC-4d68c1b509cd289e9f02cbf258e69f2539349029.tar.gz MultiMC-4d68c1b509cd289e9f02cbf258e69f2539349029.tar.lz MultiMC-4d68c1b509cd289e9f02cbf258e69f2539349029.tar.xz MultiMC-4d68c1b509cd289e9f02cbf258e69f2539349029.zip | |
GH-2291 Fix build with Qt 5.11+
Diffstat (limited to 'libraries')
| -rw-r--r-- | libraries/LocalPeer/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | libraries/classparser/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | libraries/ganalytics/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | libraries/iconfix/CMakeLists.txt | 2 | ||||
| m--------- | libraries/quazip | 0 | ||||
| -rw-r--r-- | libraries/rainbow/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | libraries/systeminfo/CMakeLists.txt | 2 |
7 files changed, 6 insertions, 7 deletions
diff --git a/libraries/LocalPeer/CMakeLists.txt b/libraries/LocalPeer/CMakeLists.txt index 99e3fe4d..3d2a1e62 100644 --- a/libraries/LocalPeer/CMakeLists.txt +++ b/libraries/LocalPeer/CMakeLists.txt @@ -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) diff --git a/libraries/classparser/CMakeLists.txt b/libraries/classparser/CMakeLists.txt index db266f53..e9606258 100644 --- a/libraries/classparser/CMakeLists.txt +++ b/libraries/classparser/CMakeLists.txt @@ -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) diff --git a/libraries/ganalytics/CMakeLists.txt b/libraries/ganalytics/CMakeLists.txt index 26b1b47c..cf1cc559 100644 --- a/libraries/ganalytics/CMakeLists.txt +++ b/libraries/ganalytics/CMakeLists.txt @@ -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) diff --git a/libraries/iconfix/CMakeLists.txt b/libraries/iconfix/CMakeLists.txt index 93bfdd06..d0b7aa34 100644 --- a/libraries/iconfix/CMakeLists.txt +++ b/libraries/iconfix/CMakeLists.txt @@ -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) diff --git a/libraries/quazip b/libraries/quazip -Subproject 683e2ec8ada758d6e48d31ec606840802e6941b +Subproject 469b97b618314ec009a37cad22e9d2541d6481f diff --git a/libraries/rainbow/CMakeLists.txt b/libraries/rainbow/CMakeLists.txt index bc561800..b7e11045 100644 --- a/libraries/rainbow/CMakeLists.txt +++ b/libraries/rainbow/CMakeLists.txt @@ -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( diff --git a/libraries/systeminfo/CMakeLists.txt b/libraries/systeminfo/CMakeLists.txt index 393b5318..173d7b59 100644 --- a/libraries/systeminfo/CMakeLists.txt +++ b/libraries/systeminfo/CMakeLists.txt @@ -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) |