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

Merge pull request #4173 from jdumas/jdumas/ziplib 

Do not build ziplib when 3MF exporter is disabled.
pull/4187/head
Kim Kulling 2021-11-17 14:09:07 +01:00 committed by GitHub
parent c174575cf8 ce3101ea4e
commit b1c83f437f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
code/CMakeLists.txt
View File

@ -953,24 +953,27 @@ ELSE()
ENDIF() ENDIF()
# zip (https://github.com/kuba--/zip) # zip (https://github.com/kuba--/zip)
IF(ASSIMP_HUNTER_ENABLED) separate_arguments(ASSIMP_EXPORTERS_LIST UNIX_COMMAND ${ASSIMP_EXPORTERS_ENABLED})
hunter_add_package(zip) IF(3MF IN_LIST ASSIMP_EXPORTERS_LIST)
find_package(zip CONFIG REQUIRED) IF(ASSIMP_HUNTER_ENABLED)
ELSE() hunter_add_package(zip)
SET( ziplib_SRCS find_package(zip CONFIG REQUIRED)
../contrib/zip/src/miniz.h ELSE()
../contrib/zip/src/zip.c SET( ziplib_SRCS
../contrib/zip/src/zip.h ../contrib/zip/src/miniz.h
) ../contrib/zip/src/zip.c
../contrib/zip/src/zip.h
)
# TODO if cmake required version has been updated to >3.12.0, collapse this to the second case only # TODO if cmake required version has been updated to >3.12.0, collapse this to the second case only
if(${CMAKE_VERSION} VERSION_LESS "3.12.0") if(${CMAKE_VERSION} VERSION_LESS "3.12.0")
add_definitions(-DMINIZ_USE_UNALIGNED_LOADS_AND_STORES=0) add_definitions(-DMINIZ_USE_UNALIGNED_LOADS_AND_STORES=0)
else() else()
add_compile_definitions(MINIZ_USE_UNALIGNED_LOADS_AND_STORES=0) add_compile_definitions(MINIZ_USE_UNALIGNED_LOADS_AND_STORES=0)
endif() endif()
SOURCE_GROUP( ziplib FILES ${ziplib_SRCS} ) SOURCE_GROUP( ziplib FILES ${ziplib_SRCS} )
ENDIF()
ENDIF() ENDIF()
# openddlparser # openddlparser
@ -1186,10 +1189,12 @@ IF(ASSIMP_HUNTER_ENABLED)
ZLIB::zlib ZLIB::zlib
RapidJSON::rapidjson RapidJSON::rapidjson
utf8cpp utf8cpp
zip::zip
pugixml pugixml
stb::stb stb::stb
) )
if(TARGET zip::zip)
target_link_libraries(assimp PUBLIC zip::zip)
endif()
if (ASSIMP_BUILD_DRACO) if (ASSIMP_BUILD_DRACO)
target_link_libraries(assimp PUBLIC ${draco_LIBRARIES}) target_link_libraries(assimp PUBLIC ${draco_LIBRARIES})