From e6988f62f6c57be9ea80d277460549f501d254bf Mon Sep 17 00:00:00 2001 From: Gustav Date: Mon, 29 Dec 2014 16:18:17 +0100 Subject: [PATCH 1/2] Fixed cmake 3x cmp0048 warning --- contrib/zlib/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contrib/zlib/CMakeLists.txt b/contrib/zlib/CMakeLists.txt index 5d7b58c43..c05509fdf 100644 --- a/contrib/zlib/CMakeLists.txt +++ b/contrib/zlib/CMakeLists.txt @@ -1,7 +1,11 @@ cmake_minimum_required(VERSION 2.4.4) set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON) +# use the old project command http://www.cmake.org/cmake/help/v3.0/policy/CMP0048.html +cmake_policy(PUSH) +cmake_policy(SET CMP0048 OLD) project(zlib C) +cmake_policy(POP) set(VERSION "1.2.8") From 7c17c5f46b34f1318083894ee840927b47a26f4d Mon Sep 17 00:00:00 2001 From: Gustav Date: Mon, 29 Dec 2014 16:30:44 +0100 Subject: [PATCH 2/2] Also install zlibstatic --- contrib/zlib/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/contrib/zlib/CMakeLists.txt b/contrib/zlib/CMakeLists.txt index c05509fdf..dd9e742ea 100644 --- a/contrib/zlib/CMakeLists.txt +++ b/contrib/zlib/CMakeLists.txt @@ -189,3 +189,8 @@ if(MINGW) endif(MINGW) add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) +INSTALL( TARGETS zlibstatic + LIBRARY DESTINATION ${ASSIMP_LIB_INSTALL_DIR} + ARCHIVE DESTINATION ${ASSIMP_LIB_INSTALL_DIR} + RUNTIME DESTINATION ${ASSIMP_BIN_INSTALL_DIR} + COMPONENT ${LIBASSIMP_COMPONENT})