瀏覽代碼

* BugFix: Correct Assimp building its own copy of ZLib.

Robert MacGregor 3 年之前
父節點
當前提交
0b15bc25e0
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      Engine/lib/CMakeLists.txt

+ 2 - 2
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)
+add_subdirectory(glad ${CMAKE_BINARY_DIR}/temp/glad EXCLUDE_FROM_ALL)