From d57872c77a33848f5452e49bae9a91251181df9f Mon Sep 17 00:00:00 2001 From: tamasmeszaros Date: Mon, 3 Jun 2019 10:02:13 +0200 Subject: [PATCH] Fix for older cmake versions and build of examples. --- CMakeLists.txt | 13 +++++++++++-- miniz.h | 10 ++++++---- miniz_tdef.c | 1 - miniz_tinfl.c | 2 +- miniz_zip.c | 2 +- 5 files changed, 19 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a4e6b40..9934e9f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,12 @@ -PROJECT(miniz C) -cmake_minimum_required(VERSION 3.4) +cmake_minimum_required(VERSION 3.0) + +if(CMAKE_MINOR_VERSION LESS 12) + project(miniz) + # see issue https://gitlab.kitware.com/cmake/cmake/merge_requests/1799 +else() + project(miniz C) +endif() + set(Upstream_VERSION 2.1.0) @@ -81,6 +88,8 @@ else(AMALGAMATE_SOURCES) string(TOUPPER ${PROJECT_NAME} PROJECT_UPPER) set_target_properties(${PROJECT_NAME} PROPERTIES INTERFACE_COMPILE_DEFINITIONS ${PROJECT_UPPER}_STATIC_DEFINE) + else() + set_property(TARGET ${PROJECT_NAME} PROPERTY C_VISIBILITY_PRESET hidden) endif() set_property(TARGET ${PROJECT_NAME} PROPERTY VERSION ${Upstream_VERSION}) diff --git a/miniz.h b/miniz.h index 6e160bf..3018dae 100644 --- a/miniz.h +++ b/miniz.h @@ -112,10 +112,7 @@ */ #pragma once -#include "miniz_common.h" -#include "miniz_tdef.h" -#include "miniz_tinfl.h" -#include "miniz_zip.h" +#include "miniz_export.h" /* Defines to completely disable specific portions of miniz.c: If all macros here are defined the only functionality remaining will be CRC-32, adler-32, tinfl, and tdefl. */ @@ -476,3 +473,8 @@ typedef void *const voidpc; #ifdef __cplusplus } #endif + +#include "miniz_common.h" +#include "miniz_tdef.h" +#include "miniz_tinfl.h" +#include "miniz_zip.h" diff --git a/miniz_tdef.c b/miniz_tdef.c index a8a9593..64113f8 100644 --- a/miniz_tdef.c +++ b/miniz_tdef.c @@ -24,7 +24,6 @@ * **************************************************************************/ -#include "miniz_tdef.h" #include "miniz.h" #ifdef __cplusplus diff --git a/miniz_tinfl.c b/miniz_tinfl.c index 5120ba1..992de7a 100644 --- a/miniz_tinfl.c +++ b/miniz_tinfl.c @@ -24,7 +24,7 @@ * **************************************************************************/ -#include "miniz_tinfl.h" +#include "miniz.h" #ifdef __cplusplus extern "C" { diff --git a/miniz_zip.c b/miniz_zip.c index 955ee20..7358f0b 100644 --- a/miniz_zip.c +++ b/miniz_zip.c @@ -24,7 +24,7 @@ * THE SOFTWARE. * **************************************************************************/ -#include "miniz_zip.h" +#include "miniz.h" #ifndef MINIZ_NO_ARCHIVE_APIS