From 0b15bc25e016e4f88f14af3930c8fc689b257fb9 Mon Sep 17 00:00:00 2001 From: Robert MacGregor Date: Tue, 31 May 2022 20:42:49 -0400 Subject: [PATCH] * BugFix: Correct Assimp building its own copy of ZLib. --- Engine/lib/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Engine/lib/CMakeLists.txt b/Engine/lib/CMakeLists.txt index 4862a94b5..3efbb5635 100644 --- a/Engine/lib/CMakeLists.txt +++ b/Engine/lib/CMakeLists.txt @@ -17,7 +17,7 @@ set(ZLIB_ROOT "${ZLIB_ROOT}" CACHE STRING "ZLib root location" FORCE) # Assimp depends on zlib set(BUILD_SHARED_LIBS off CACHE STRING "") -set(ASSIMP_BUILD_ZLIB on CACHE STRING "") +set(ASSIMP_BUILD_ZLIB off CACHE STRING "") set(ASSIMP_HUNTER_ENABLED off CACHE STRING "") add_subdirectory(assimp ${CMAKE_BINARY_DIR}/temp/assimp EXCLUDE_FROM_ALL) @@ -29,4 +29,4 @@ add_subdirectory(pcre ${CMAKE_BINARY_DIR}/temp/pcre EXCLUDE_FROM_ALL) add_subdirectory(convexDecomp ${CMAKE_BINARY_DIR}/temp/convexDecomp EXCLUDE_FROM_ALL) add_subdirectory(squish ${CMAKE_BINARY_DIR}/temp/squish EXCLUDE_FROM_ALL) add_subdirectory(collada ${CMAKE_BINARY_DIR}/temp/collada EXCLUDE_FROM_ALL) -add_subdirectory(glad ${CMAKE_BINARY_DIR}/temp/glad EXCLUDE_FROM_ALL) \ No newline at end of file +add_subdirectory(glad ${CMAKE_BINARY_DIR}/temp/glad EXCLUDE_FROM_ALL)