diff options
| author | Petr Mrázek <peterix@gmail.com> | 2017-05-06 17:22:14 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2017-05-06 17:36:57 +0200 |
| commit | 15c829fd3ce0de04db938566a56e66531c320580 (patch) | |
| tree | 629ca7ea6d2433a1c6dafdf0c4268ef21f30e7f8 /libraries | |
| parent | 349381cb2b930263dda875945b912b74656fd847 (diff) | |
| download | MultiMC-15c829fd3ce0de04db938566a56e66531c320580.tar MultiMC-15c829fd3ce0de04db938566a56e66531c320580.tar.gz MultiMC-15c829fd3ce0de04db938566a56e66531c320580.tar.lz MultiMC-15c829fd3ce0de04db938566a56e66531c320580.tar.xz MultiMC-15c829fd3ce0de04db938566a56e66531c320580.zip | |
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
Diffstat (limited to 'libraries')
| -rw-r--r-- | libraries/pack200/CMakeLists.txt | 4 | ||||
| m--------- | libraries/quazip | 0 |
2 files changed, 3 insertions, 1 deletions
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") diff --git a/libraries/quazip b/libraries/quazip new file mode 160000 +Subproject 2c40fc85b465b9af33424322de30e4fd09c5c0b |