Merge pull request isl-org#6 from akashsharma02/cuda

Fix for tinyobjloader submodule
akashsharma02 · May 18, 2020 · 2d4a917 · 2d4a917
2 parents cb934bb + 2adec97
commit 2d4a917
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -12,10 +12,6 @@
 	path = 3rdparty/googletest
 	url = https://github.com/google/googletest.git
 	branch = master
-[submodule "3rdparty/tinyobjloader"]
-	path = 3rdparty/tinyobjloader/tinyobjloader
-	url = https://github.com/syoyo/tinyobjloader.git
-	branch = master
 [submodule "3rdparty/open3d_sphinx_theme"]
 	path = 3rdparty/open3d_sphinx_theme
 	url = https://github.com/intel-isl/open3d_sphinx_theme.git
@@ -37,3 +33,6 @@
 [submodule "3rdparty/benchmark"]
 	path = 3rdparty/benchmark
 	url = https://github.com/google/benchmark.git
+[submodule "3rdparty/tinyobjloader"]
+	path = 3rdparty/tinyobjloader/tinyobjloader
+	url = https://github.com/tinyobjloader/tinyobjloader.git
diff --git a/3rdparty/tinyobjloader/tinyobjloader b/3rdparty/tinyobjloader/tinyobjloader
diff --git a/src/Cuda/CMakeLists.txt b/src/Cuda/CMakeLists.txt
@@ -58,7 +58,6 @@ add_library(${OPEN3D_CUDA_MODULE}
 # open3d_show_and_abort_on_warning(${OPEN3D_CUDA_MODULE})
 open3d_set_global_properties(${OPEN3D_CUDA_MODULE})
 open3d_link_3rdparty_libraries(${OPEN3D_CUDA_MODULE})
-# target_link_libraries(${OPEN3D_CUDA_MODULE} PUBLIC CUDA::curand)
 
 add_library(${PROJECT_NAME}::${OPEN3D_CUDA_MODULE} ALIAS ${OPEN3D_CUDA_MODULE})