From bfe35fc06bad3bd12066219e456fbe61f79399ba Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 27 Dec 2020 15:27:41 +0100 Subject: [PATCH 1/4] contrib/zlib/CMakeLists.txt: don't install zlib Don't install zlib static library to avoid potential conflicts with a system-wide zlib package Signed-off-by: Fabrice Fontaine --- contrib/zlib/CMakeLists.txt | 7 ------- 1 file changed, 7 deletions(-) diff --git a/contrib/zlib/CMakeLists.txt b/contrib/zlib/CMakeLists.txt index c284656eb..e78fd25da 100644 --- a/contrib/zlib/CMakeLists.txt +++ b/contrib/zlib/CMakeLists.txt @@ -197,10 +197,3 @@ if(MINGW) endif(MINGW) add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) - -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} - COMPONENT ${LIBASSIMP_COMPONENT}) From b23ecb4864286beffe548cf3b0a23454950df95b Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Wed, 6 Jan 2021 18:51:30 +0100 Subject: [PATCH 2/4] 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}) From 5222ab989f561f416777e00022b558b6fa8e5854 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Wed, 6 Jan 2021 18:51:59 +0100 Subject: [PATCH 3/4] Fix a typo --- contrib/zlib/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/zlib/CMakeLists.txt b/contrib/zlib/CMakeLists.txt index 470fd62f3..ed7412e3e 100644 --- a/contrib/zlib/CMakeLists.txt +++ b/contrib/zlib/CMakeLists.txt @@ -204,5 +204,5 @@ IF(WIN32 LIBRARY DESTINATION ${ASSIMP_LIB_INSTALL_DIR} ARCHIVE DESTINATION ${ASSIMP_LIB_INSTALL_DIR} RUNTIME DESTINATION ${ASSIMP_BIN_INSTALL_DIR} + COMPONENT ${LIBASSIMP_COMPONENT}) ENDIF() - COMPONENT ${LIBASSIMP_COMPONENT}) From d898ecc80c3c48b239d83eed440c2f50cdbfd3c6 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Wed, 6 Jan 2021 18:59:13 +0100 Subject: [PATCH 4/4] Fix another typo. --- contrib/zlib/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/zlib/CMakeLists.txt b/contrib/zlib/CMakeLists.txt index ed7412e3e..0e8a4b1e1 100644 --- a/contrib/zlib/CMakeLists.txt +++ b/contrib/zlib/CMakeLists.txt @@ -198,7 +198,7 @@ endif(MINGW) add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) -IF(WIN32 +IF(WIN32) INSTALL( TARGETS zlibstatic EXPORT "${TARGETS_EXPORT_NAME}" LIBRARY DESTINATION ${ASSIMP_LIB_INSTALL_DIR}