closes https://github.com/assimp/assimp/issues/2336: use new cmp_048 policy even for zlib in the assimp build.
parent
03bd8905f5
commit
79f62b0174
|
@ -5,12 +5,17 @@ set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
|
|||
# See http://www.cmake.org/cmake/help/v3.0/policy/CMP0048.html
|
||||
cmake_policy(PUSH)
|
||||
if(CMAKE_MAJOR_VERSION GREATER 2)
|
||||
cmake_policy(SET CMP0048 OLD)
|
||||
cmake_policy(SET CMP0048 NEW)
|
||||
endif()
|
||||
project(zlib C)
|
||||
SET (ZLIB_VERSION_MAJOR 1)
|
||||
SET (ZLIB_VERSION_MINOR 2)
|
||||
SET (ZLIB_VERSION_PATCH 11)
|
||||
SET (ZLIB_VERSION ${ZLIB_VERSION_MAJOR}.${ZLIB_VERSION_MINOR}.${ZLIB_VERSION_PATCH})
|
||||
SET (ZLIB_SOVERSION 1)
|
||||
SET (PROJECT_VERSION "${ZLIB_VERSION}")
|
||||
cmake_policy(POP)
|
||||
|
||||
set(VERSION "1.2.11.1")
|
||||
|
||||
option(ASM686 "Enable building i686 assembly implementation")
|
||||
option(AMD64 "Enable building amd64 assembly implementation")
|
||||
|
|
Loading…
Reference in New Issue