diff options
| author | tamasmeszaros <meszaros.q@gmail.com> | 2021-10-12 10:58:45 +0300 |
|---|---|---|
| committer | tamasmeszaros <meszaros.q@gmail.com> | 2021-10-12 10:59:59 +0300 |
| commit | 94843bb6bf1a99af6fafcc21a81912dd3dff71e7 (patch) | |
| tree | 2a6dad044b75f70af213c6b81bca2fcfd35729a4 /src | |
| parent | e28ebf9386c5e9482b1c5859adbf6860aedb6f85 (diff) | |
Removing search for upstream miniz as its no longer compatible.
Due to 729298c40854e97dbaf051316f789dbd2f873a31
fixes #7080
Diffstat (limited to 'src')
| -rw-r--r-- | src/miniz/CMakeLists.txt | 32 |
1 files changed, 9 insertions, 23 deletions
diff --git a/src/miniz/CMakeLists.txt b/src/miniz/CMakeLists.txt index a664f7460..04d562b76 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() +add_library(miniz_static STATIC + miniz.c + miniz.h +) -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() +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...") +target_link_libraries(miniz INTERFACE miniz_static) +target_include_directories(miniz INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) -endif() |