From 6db343386b73d69e0e4c14ab0bde0edab5e1585f Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Fri, 15 Jan 2021 16:46:15 +0100 Subject: [PATCH 1/3] remove install of zlibstatic --- contrib/zlib/CMakeLists.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/contrib/zlib/CMakeLists.txt b/contrib/zlib/CMakeLists.txt index 0e8a4b1e1..f088646a7 100644 --- a/contrib/zlib/CMakeLists.txt +++ b/contrib/zlib/CMakeLists.txt @@ -198,11 +198,11 @@ 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} - COMPONENT ${LIBASSIMP_COMPONENT}) -ENDIF() +#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} +# COMPONENT ${LIBASSIMP_COMPONENT}) +#ENDIF() From 8ad2661e0c85c80051992beee84c4c69c2ab1836 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Sat, 16 Jan 2021 12:00:42 +0100 Subject: [PATCH 2/3] Update CMakeLists.txt --- contrib/zlib/CMakeLists.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/contrib/zlib/CMakeLists.txt b/contrib/zlib/CMakeLists.txt index f088646a7..0e8a4b1e1 100644 --- a/contrib/zlib/CMakeLists.txt +++ b/contrib/zlib/CMakeLists.txt @@ -198,11 +198,11 @@ 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} -# COMPONENT ${LIBASSIMP_COMPONENT}) -#ENDIF() +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} + COMPONENT ${LIBASSIMP_COMPONENT}) +ENDIF() From 9334e076195635634adceeafdee68573e7c923d9 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Sat, 16 Jan 2021 16:14:49 +0100 Subject: [PATCH 3/3] Update CMakeLists.txt --- contrib/zlib/CMakeLists.txt | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/contrib/zlib/CMakeLists.txt b/contrib/zlib/CMakeLists.txt index 0e8a4b1e1..469151ff6 100644 --- a/contrib/zlib/CMakeLists.txt +++ b/contrib/zlib/CMakeLists.txt @@ -198,11 +198,9 @@ 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} - COMPONENT ${LIBASSIMP_COMPONENT}) -ENDIF() +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})