From b23ecb4864286beffe548cf3b0a23454950df95b Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Wed, 6 Jan 2021 18:51:30 +0100 Subject: [PATCH] Update CMakeLists.txt - Update minimum cmake version - install for win32-platforms to avoid conflicts with targets for win32 --- contrib/zlib/CMakeLists.txt | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/contrib/zlib/CMakeLists.txt b/contrib/zlib/CMakeLists.txt index e78fd25da..470fd62f3 100644 --- a/contrib/zlib/CMakeLists.txt +++ b/contrib/zlib/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.4.4) +cmake_minimum_required(VERSION 3.10.0) set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON) # CMake 3.0 changed the project command, setting policy CMP0048 reverts to the old behaviour. @@ -197,3 +197,12 @@ if(MINGW) endif(MINGW) add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) + +IF(WIN32 + INSTALL( TARGETS zlibstatic + EXPORT "${TARGETS_EXPORT_NAME}" + LIBRARY DESTINATION ${ASSIMP_LIB_INSTALL_DIR} + ARCHIVE DESTINATION ${ASSIMP_LIB_INSTALL_DIR} + RUNTIME DESTINATION ${ASSIMP_BIN_INSTALL_DIR} +ENDIF() + COMPONENT ${LIBASSIMP_COMPONENT})