Fix for older cmake versions and build of examples.

This commit is contained in:
tamasmeszaros
2019-06-03 10:02:13 +02:00
parent b713ca2b4a
commit d57872c77a
5 changed files with 19 additions and 9 deletions

View File

@@ -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})

10
miniz.h
View File

@@ -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"

View File

@@ -24,7 +24,6 @@
*
**************************************************************************/
#include "miniz_tdef.h"
#include "miniz.h"
#ifdef __cplusplus

View File

@@ -24,7 +24,7 @@
*
**************************************************************************/
#include "miniz_tinfl.h"
#include "miniz.h"
#ifdef __cplusplus
extern "C" {

View File

@@ -24,7 +24,7 @@
* THE SOFTWARE.
*
**************************************************************************/
#include "miniz_zip.h"
#include "miniz.h"
#ifndef MINIZ_NO_ARCHIVE_APIS