From 15c829fd3ce0de04db938566a56e66531c320580 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sat, 6 May 2017 17:22:14 +0200 Subject: GH-1876 Fork and update quazip * It is added as a new submodule: https://github.com/MultiMC/quazip/tree/multimc-1 * Its build system has been entirely replaced to remove the existing issues with it * It now has working unit tests * No more patches needed * It has a static linking exception in its license now, but we use it shared anyway --- libraries/pack200/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'libraries/pack200') diff --git a/libraries/pack200/CMakeLists.txt b/libraries/pack200/CMakeLists.txt index 85f32408..359445d2 100644 --- a/libraries/pack200/CMakeLists.txt +++ b/libraries/pack200/CMakeLists.txt @@ -26,7 +26,9 @@ set(PACK200_SRC src/zip.h ) -set(CMAKE_POSITION_INDEPENDENT_CODE ON) +if (Qt5_POSITION_INDEPENDENT_CODE) + SET(CMAKE_POSITION_INDEPENDENT_CODE ON) +endif() add_library(MultiMC_unpack200 SHARED ${PACK200_SRC}) target_include_directories(MultiMC_unpack200 PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_BINARY_DIR}" PRIVATE ${ZLIB_INCLUDE_DIRS} "${CMAKE_CURRENT_SOURCE_DIR}/src") -- cgit v1.2.3