v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update CMakeLists.txt 

- Update minimum cmake version
- install for win32-platforms to avoid conflicts with targets for win32
pull/3561/head
Kim Kulling 2021-01-06 18:51:30 +01:00 committed by GitHub
parent bfe35fc06b
commit b23ecb4864
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
contrib/zlib/CMakeLists.txt
View File

@ -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) set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
# CMake 3.0 changed the project command, setting policy CMP0048 reverts to the old behaviour. # CMake 3.0 changed the project command, setting policy CMP0048 reverts to the old behaviour.
@ -197,3 +197,12 @@ if(MINGW)
endif(MINGW) endif(MINGW)
add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) 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})