MultiMC/quazip
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1 from Prototik/patch-1

Browse source 
Fix build with Qt 5.11+
This commit is contained in:
Petr Mrázek 2018-06-05 00:46:35 +02:00 committed by GitHub
commit 3691d57d3a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -44,10 +44,9 @@ endif()
add_library(MultiMC_quazip SHARED ${QUAZIP_SRC}) add_library(MultiMC_quazip SHARED ${QUAZIP_SRC})
target_include_directories(MultiMC_quazip PUBLIC "quazip" "${CMAKE_CURRENT_BINARY_DIR}" PRIVATE ${ZLIB_INCLUDE_DIRS}) target_include_directories(MultiMC_quazip PUBLIC "quazip" "${CMAKE_CURRENT_BINARY_DIR}" PRIVATE ${ZLIB_INCLUDE_DIRS})
target_link_libraries(MultiMC_quazip ${ZLIB_LIBRARIES}) target_link_libraries(MultiMC_quazip Qt5::Core ${ZLIB_LIBRARIES})
target_compile_definitions(MultiMC_quazip PRIVATE "-DQUAZIP_BUILD") target_compile_definitions(MultiMC_quazip PRIVATE "-DQUAZIP_BUILD")
set_target_properties(MultiMC_quazip PROPERTIES CXX_VISIBILITY_PRESET hidden VISIBILITY_INLINES_HIDDEN 1) set_target_properties(MultiMC_quazip PROPERTIES CXX_VISIBILITY_PRESET hidden VISIBILITY_INLINES_HIDDEN 1)
qt5_use_modules(MultiMC_quazip Core)
# Install it # Install it
install( install(
@ -84,6 +83,5 @@ set(QUAZIP_TEST_SRC
) )
add_executable(MultiMC_quazip_test ${QUAZIP_TEST_SRC}) add_executable(MultiMC_quazip_test ${QUAZIP_TEST_SRC})
target_link_libraries(MultiMC_quazip_test MultiMC_quazip) target_link_libraries(MultiMC_quazip_test MultiMC_quazip Qt5::Network Qt5::Test)
qt5_use_modules(MultiMC_quazip_test Network Test)
add_test(NAME quazip_testsuite COMMAND MultiMC_quazip_test) add_test(NAME quazip_testsuite COMMAND MultiMC_quazip_test)