Merge branch 'tm_minz_update'

src/miniz/CMakeLists.txt

@@ -1,16 +1,31 @@
 project(miniz)
 cmake_minimum_required(VERSION 2.6)
 
-add_library(miniz STATIC
-    miniz.h
-    miniz_common.h
-    miniz_tdef.h
-    miniz_tinfl.h
-    miniz_zip.h
-    miniz.cpp
-    miniz_tdef.cpp
-    miniz_tinfl.cpp
-    miniz_zip.cpp
-)
+add_library(miniz INTERFACE)
 
-target_link_libraries(miniz nowide)
+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...")
+
+endif()