blob: 14b58438f8d67adff64968e1ea5448349fd65de8 (
plain)
1 From 469b97b618314ec009a37cad22e9d2541d6481f7 Mon Sep 17 00:00:00 2001
2 From: Sergey Shatunov <me@prok.pw>
3 Date: Fri, 1 Jun 2018 21:07:13 +0700
4 Subject: [PATCH] Fix build with Qt 5.11+
5
6 ---
7 CMakeLists.txt | 6 ++----
8 1 file changed, 2 insertions(+), 4 deletions(-)
9
10 diff --git a/CMakeLists.txt b/CMakeLists.txt
11 index 376583c..7c0c6eb 100644
12 --- a/CMakeLists.txt
13 +++ b/CMakeLists.txt
14 @@ -44,10 +44,9 @@ endif()
15
16 add_library(MultiMC_quazip SHARED ${QUAZIP_SRC})
17 target_include_directories(MultiMC_quazip PUBLIC "quazip" "${CMAKE_CURRENT_BINARY_DIR}" PRIVATE ${ZLIB_INCLUDE_DIRS})
18 -target_link_libraries(MultiMC_quazip ${ZLIB_LIBRARIES})
19 +target_link_libraries(MultiMC_quazip Qt5::Core ${ZLIB_LIBRARIES})
20 target_compile_definitions(MultiMC_quazip PRIVATE "-DQUAZIP_BUILD")
21 set_target_properties(MultiMC_quazip PROPERTIES CXX_VISIBILITY_PRESET hidden VISIBILITY_INLINES_HIDDEN 1)
22 -qt5_use_modules(MultiMC_quazip Core)
23
24 # Install it
25 install(
26 @@ -84,6 +83,5 @@ set(QUAZIP_TEST_SRC
27 )
28
29 add_executable(MultiMC_quazip_test ${QUAZIP_TEST_SRC})
30 -target_link_libraries(MultiMC_quazip_test MultiMC_quazip)
31 -qt5_use_modules(MultiMC_quazip_test Network Test)
32 +target_link_libraries(MultiMC_quazip_test MultiMC_quazip Qt5::Network Qt5::Test)
33 add_test(NAME quazip_testsuite COMMAND MultiMC_quazip_test)
|
