removed dependency on libSPGrid.so

yuanming-hu · Sep 7, 2018 · b6a270d · b6a270d
1 parent 871a74d
commit b6a270d
Show file tree

Hide file tree

Showing 25 changed files with 6 additions and 1,930 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -17,7 +17,12 @@ include_directories(external/libccd/src)
 set(TAICHI_PROJECT_LIBRARIES ${TAICHI_PROJECT_LIBRARIES} ${TAICHI_PROJECT_NAME} PARENT_SCOPE)
 target_link_libraries(taichi_${TAICHI_PROJECT_NAME} ${CORE_LIBRARY_NAME})
 target_link_libraries(taichi_${TAICHI_PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR}/external/partio/lib/libpartio.a)
-target_link_libraries(taichi_${TAICHI_PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR}/external/lib/libSPGrid.so)
+
+find_package(ZLIB)
+if (ZLIB_FOUND)
+    target_link_libraries(taichi_${TAICHI_PROJECT_NAME} z)
+endif(ZLIB_FOUND)
+
 target_link_libraries(taichi_${TAICHI_PROJECT_NAME} ccd)
 
 add_subdirectory(external/libccd)

diff --git a/external/SPGrid/Tools/SPGrid_Add.h b/external/SPGrid/Tools/SPGrid_Add.h
diff --git a/external/SPGrid/Tools/SPGrid_Arithmetic.h b/external/SPGrid/Tools/SPGrid_Arithmetic.h
diff --git a/external/SPGrid/Tools/SPGrid_Block_Iterator.h b/external/SPGrid/Tools/SPGrid_Block_Iterator.h
diff --git a/external/SPGrid/Tools/SPGrid_Clear.h b/external/SPGrid/Tools/SPGrid_Clear.h