update partio

yuanming-hu · Nov 5, 2018 · b291b72 · b291b72
1 parent 17a101e
commit b291b72
Show file tree

Hide file tree

Showing 98 changed files with 205 additions and 9,571 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,8 +6,7 @@ else()
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHASWELL")
 endif()
 
-file(GLOB PROJECT_SOURCES
-        "src/*.cpp" "external/SPGrid/*/*.cpp", "src/async/*.cpp")
+file(GLOB PROJECT_SOURCES "src/*.cpp" "external/SPGrid/*/*.cpp" "src/async/*.cpp")
 
 add_library(taichi_${TAICHI_PROJECT_NAME} SHARED ${PROJECT_SOURCES})
 include_directories(external/partio/include)
@@ -16,14 +15,14 @@ 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} partio)
+
+add_subdirectory(external/libccd)
+add_subdirectory(external/partio)
 
 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/partio/src/lib/CMakeLists.txt → external/partio/CMakeLists.txt b/external/partio/src/lib/CMakeLists.txt → external/partio/CMakeLists.txt
@@ -31,11 +31,9 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 
-FILE(GLOB io_cpp "io/*.cpp")
-FILE(GLOB core_cpp "core/*.cpp")
-ADD_LIBRARY (partio ${io_cpp} ${core_cpp})
+FILE(GLOB io_cpp "src/io/*.cpp")
+FILE(GLOB core_cpp "src/core/*.cpp")
+ADD_LIBRARY (partio SHARED ${io_cpp} ${core_cpp})
 
 FILE(GLOB public_includes "*.h")
 
-INSTALL (TARGETS partio DESTINATION lib)
-INSTALL (FILES ${public_includes} DESTINATION include)
diff --git a/external/partio/bin/partattr b/external/partio/bin/partattr
diff --git a/external/partio/bin/partconv b/external/partio/bin/partconv
diff --git a/external/partio/bin/partconvert b/external/partio/bin/partconvert
diff --git a/external/partio/bin/partinfo b/external/partio/bin/partinfo
diff --git a/external/partio/bin/partview b/external/partio/bin/partview
diff --git a/external/partio/lib/libpartio.a b/external/partio/lib/libpartio.a
diff --git a/external/partio/src/Makefile b/external/partio/src/Makefile
diff --git a/external/partio/src/lib/Partio.h → external/partio/src/Partio.h b/external/partio/src/lib/Partio.h → external/partio/src/Partio.h
diff --git a/external/partio/src/lib/PartioAttribute.h → external/partio/src/PartioAttribute.h b/external/partio/src/lib/PartioAttribute.h → external/partio/src/PartioAttribute.h
diff --git a/external/partio/src/lib/PartioIterator.h → external/partio/src/PartioIterator.h b/external/partio/src/lib/PartioIterator.h → external/partio/src/PartioIterator.h
diff --git a/external/partio/src/lib/core/KdTree.h → external/partio/src/core/KdTree.h b/external/partio/src/lib/core/KdTree.h → external/partio/src/core/KdTree.h
diff --git a/external/partio/src/lib/core/Mutex.h → external/partio/src/core/Mutex.h b/external/partio/src/lib/core/Mutex.h → external/partio/src/core/Mutex.h
diff --git a/external/partio/src/lib/core/Particle.cpp → external/partio/src/core/Particle.cpp b/external/partio/src/lib/core/Particle.cpp → external/partio/src/core/Particle.cpp
diff --git a/...l/partio/src/lib/core/ParticleCaching.cpp → external/partio/src/core/ParticleCaching.cpp b/...l/partio/src/lib/core/ParticleCaching.cpp → external/partio/src/core/ParticleCaching.cpp
diff --git a/...nal/partio/src/lib/core/ParticleCaching.h → external/partio/src/core/ParticleCaching.h b/...nal/partio/src/lib/core/ParticleCaching.h → external/partio/src/core/ParticleCaching.h
diff --git a/...l/partio/src/lib/core/ParticleHeaders.cpp → external/partio/src/core/ParticleHeaders.cpp b/...l/partio/src/lib/core/ParticleHeaders.cpp → external/partio/src/core/ParticleHeaders.cpp
diff --git a/...nal/partio/src/lib/core/ParticleHeaders.h → external/partio/src/core/ParticleHeaders.h b/...nal/partio/src/lib/core/ParticleHeaders.h → external/partio/src/core/ParticleHeaders.h
diff --git a/...al/partio/src/lib/core/ParticleSimple.cpp → external/partio/src/core/ParticleSimple.cpp b/...al/partio/src/lib/core/ParticleSimple.cpp → external/partio/src/core/ParticleSimple.cpp
diff --git a/...rnal/partio/src/lib/core/ParticleSimple.h → external/partio/src/core/ParticleSimple.h b/...rnal/partio/src/lib/core/ParticleSimple.h → external/partio/src/core/ParticleSimple.h
diff --git a/...src/lib/core/ParticleSimpleInterleave.cpp → ...tio/src/core/ParticleSimpleInterleave.cpp b/...src/lib/core/ParticleSimpleInterleave.cpp → ...tio/src/core/ParticleSimpleInterleave.cpp
diff --git a/...o/src/lib/core/ParticleSimpleInterleave.h → ...artio/src/core/ParticleSimpleInterleave.h b/...o/src/lib/core/ParticleSimpleInterleave.h → ...artio/src/core/ParticleSimpleInterleave.h
diff --git a/external/partio/src/data/test.bgeo b/external/partio/src/data/test.bgeo
diff --git a/external/partio/src/data/test.geo b/external/partio/src/data/test.geo
diff --git a/external/partio/src/data/test.pdb b/external/partio/src/data/test.pdb
diff --git a/external/partio/src/doc/CMakeLists.txt b/external/partio/src/doc/CMakeLists.txt