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 /CMakeLists.txt | |
| 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 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 86f8e20a..a4a8c046 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,25 +67,6 @@ endif() include(ExternalProject) set_directory_properties(PROPERTIES EP_BASE External) -# Add quazip -add_definitions(-DQUAZIP_STATIC) -set(QUAZIP_VERSION "0.7.1") -if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/quazip-${QUAZIP_VERSION}.tar.gz) - file(DOWNLOAD http://downloads.sourceforge.net/project/quazip/quazip/${QUAZIP_VERSION}/quazip-${QUAZIP_VERSION}.tar.gz ${CMAKE_CURRENT_BINARY_DIR}/quazip-${QUAZIP_VERSION}.tar.gz) -endif() -ExternalProject_Add(QuaZIP - SOURCE_DIR <BINARY_DIR>/../Source/quazip-${QUAZIP_VERSION} - DOWNLOAD_COMMAND ${CMAKE_COMMAND} -E chdir <SOURCE_DIR>/.. ${CMAKE_COMMAND} -E tar xzf ${CMAKE_CURRENT_BINARY_DIR}/quazip-${QUAZIP_VERSION}.tar.gz - PATCH_COMMAND patch -p0 -i ${CMAKE_SOURCE_DIR}/quazip.patch - CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG} -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> -) -include_directories("${CMAKE_CURRENT_BINARY_DIR}/External/Install/QuaZIP/include/quazip") -if(UNIX) -set(QUAZIP_LIBRARIES -L"${CMAKE_CURRENT_BINARY_DIR}/External/Install/QuaZIP/lib" quazip z) -else() -set(QUAZIP_LIBRARIES -L"${CMAKE_CURRENT_BINARY_DIR}/External/Install/QuaZIP/lib" quazip) -endif() - option(NBT_BUILD_SHARED "Build NBT shared library" ON) option(NBT_USE_ZLIB "Build NBT library with zlib support" OFF) option(NBT_BUILD_TESTS "Build NBT library tests" OFF) #FIXME: fix unit tests. @@ -98,6 +79,7 @@ add_subdirectory(libraries/hoedown) # markdown parser add_subdirectory(libraries/launcher) # java based launcher part for Minecraft add_subdirectory(libraries/javacheck) # java compatibility checker add_subdirectory(libraries/xz-embedded) # xz compression +add_subdirectory(libraries/quazip) # zip manipulation library add_subdirectory(libraries/pack200) # java pack200 compression add_subdirectory(libraries/rainbow) # Qt extension for colors add_subdirectory(libraries/iconfix) # fork of Qt's QIcon loader |