From 94843bb6bf1a99af6fafcc21a81912dd3dff71e7 Mon Sep 17 00:00:00 2001 From: tamasmeszaros Date: Tue, 12 Oct 2021 09:58:45 +0200 Subject: [PATCH] Removing search for upstream miniz as its no longer compatible. Due to 729298c40854e97dbaf051316f789dbd2f873a31 fixes #7080 --- src/miniz/CMakeLists.txt | 34 ++++++++++------------------------ 1 file changed, 10 insertions(+), 24 deletions(-) diff --git a/src/miniz/CMakeLists.txt b/src/miniz/CMakeLists.txt index a664f74608..04d562b764 100644 --- a/src/miniz/CMakeLists.txt +++ b/src/miniz/CMakeLists.txt @@ -3,29 +3,15 @@ project(miniz) add_library(miniz INTERFACE) -if(NOT SLIC3R_STATIC OR CMAKE_SYSTEM_NAME STREQUAL "Linux") - find_package(miniz 2.1 QUIET) -endif() - -if(miniz_FOUND) - - message(STATUS "Using system miniz...") - target_link_libraries(miniz INTERFACE miniz::miniz) - -else() - - add_library(miniz_static STATIC - miniz.c - miniz.h - ) - - if(${CMAKE_C_COMPILER_ID} STREQUAL "GNU") - target_compile_definitions(miniz_static PRIVATE _GNU_SOURCE) - endif() - - target_link_libraries(miniz INTERFACE miniz_static) - target_include_directories(miniz INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) - - message(STATUS "Miniz NOT found in system, using bundled version...") +add_library(miniz_static STATIC + miniz.c + miniz.h +) +if(${CMAKE_C_COMPILER_ID} STREQUAL "GNU") + target_compile_definitions(miniz_static PRIVATE _GNU_SOURCE) endif() + +target_link_libraries(miniz INTERFACE miniz_static) +target_include_directories(miniz INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) +