Cmake build: Use interprocedural optimization if possible

[features.git] / 3rdparty / zlib / CMakeLists.txt

diff --git a/3rdparty/zlib/CMakeLists.txt b/3rdparty/zlib/CMakeLists.txt
index de6de6a9b74d857b0fd776af6e16402c238fce96..a8ca489369aaefcf5b5eda6682ea18e31567b769 100644 (file)
--- a/3rdparty/zlib/CMakeLists.txt
+++ b/3rdparty/zlib/CMakeLists.txt
@@ -1,10 +1,15 @@
-cmake_minimum_required(VERSION 2.4.4)
+cmake_minimum_required(VERSION 3.1)
+
+if (POLICY CMP0069)
+  cmake_policy(SET CMP0069 NEW)
+endif()
+
 set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
 
 project(zlib C)
 
-set(VERSION "1.2.8")
-set(SRCDIR ${CMAKE_CURRENT_SOURCE_DIR}/1.2.8)
+set(VERSION "1.2.11")
+set(SRCDIR ${CMAKE_CURRENT_SOURCE_DIR}/1.2.11)
 
 option(ASM686 "Enable building i686 assembly implementation")
 option(AMD64 "Enable building amd64 assembly implementation")
@@ -75,6 +80,7 @@ endif()
 
 #set(ZLIB_PC ${CMAKE_CURRENT_BINARY_DIR}/zlib.pc)
 #configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/zlib.pc.cmakein ${ZLIB_PC} @ONLY)
+set(Z_PREFIX 1)
 configure_file(${SRCDIR}/zconf.h.cmakein ${CMAKE_BINARY_DIR}/zconf.h @ONLY)
 include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})