diff options
| author | Petr Mrázek <peterix@gmail.com> | 2015-09-28 20:53:46 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2015-09-28 20:53:46 +0200 |
| commit | 143e24fa04f0126d91b65b4035dd6ec556c79b00 (patch) | |
| tree | ee0e78b50e9c433bb43149f503694843b9f2eae2 /depends/pack200 | |
| parent | 33c3850b40aba095b056738448c235190aeb1aab (diff) | |
| download | MultiMC-143e24fa04f0126d91b65b4035dd6ec556c79b00.tar MultiMC-143e24fa04f0126d91b65b4035dd6ec556c79b00.tar.gz MultiMC-143e24fa04f0126d91b65b4035dd6ec556c79b00.tar.lz MultiMC-143e24fa04f0126d91b65b4035dd6ec556c79b00.tar.xz MultiMC-143e24fa04f0126d91b65b4035dd6ec556c79b00.zip | |
NOISSUE clean up some old cmake messes
Diffstat (limited to 'depends/pack200')
| -rw-r--r-- | depends/pack200/CMakeLists.txt | 42 |
1 files changed, 12 insertions, 30 deletions
diff --git a/depends/pack200/CMakeLists.txt b/depends/pack200/CMakeLists.txt index 4624b483..19a7643c 100644 --- a/depends/pack200/CMakeLists.txt +++ b/depends/pack200/CMakeLists.txt @@ -1,24 +1,11 @@ -cmake_minimum_required(VERSION 2.6) - -if(WIN32) - # In Qt 5.1+ we have our own main() function, don't autolink to qtmain on Windows - cmake_policy(SET CMP0020 OLD) -endif() +cmake_minimum_required(VERSION 3.1) project(unpack200) +option(PACK200_BUILD_BINARY "Build a tiny utility that decompresses pack200 streams" OFF) + # Find ZLIB for quazip -# Use system zlib on unix and Qt ZLIB on Windows -if(UNIX) - find_package(ZLIB REQUIRED) -else(UNIX) - get_filename_component(ZLIB_FOUND_DIR "${Qt5Core_DIR}/../../../include/QtZlib" ABSOLUTE) - set(ZLIB_INCLUDE_DIRS ${ZLIB_FOUND_DIR} CACHE PATH "Path to ZLIB headers of Qt") - set(ZLIB_LIBRARIES "") - if(NOT EXISTS "${ZLIB_INCLUDE_DIRS}/zlib.h") - message("Please specify a valid zlib include dir") - endif(NOT EXISTS "${ZLIB_INCLUDE_DIRS}/zlib.h") -endif(UNIX) +find_package(ZLIB REQUIRED) set(PACK200_SRC include/unpack200.h @@ -41,19 +28,14 @@ set(PACK200_SRC set(CMAKE_POSITION_INDEPENDENT_CODE ON) -set(PACK200_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include" PARENT_SCOPE) -include_directories( - include - ${ZLIB_INCLUDE_DIRS} -) add_library(unpack200 STATIC ${PACK200_SRC}) +target_include_directories(unpack200 + PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" + PRIVATE ${ZLIB_INCLUDE_DIRS}) -if(UNIX) - target_link_libraries(unpack200 ${ZLIB_LIBRARIES}) -else() - # zlib is part of Qt on windows. use it. - qt5_use_modules(unpack200 Core) -endif() +target_link_libraries(unpack200 ${ZLIB_LIBRARIES}) -add_executable(anti200 anti200.cpp) -target_link_libraries(anti200 unpack200) +if(PACK200_BUILD_BINARY) + add_executable(anti200 anti200.cpp) + target_link_libraries(anti200 unpack200) +endif() |