Add deps as submodules to ensure equal env on ARM and x86.

bashimao · bashimao · commit 40fb02be36ca · 2023-05-29T09:06:01.000Z
diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,10 @@
 [submodule "tests/googletest"]
-	path = tests/googletest
+	path = third_party/googletest
 	url = https://github.com/google/googletest.git
 	ignore = dirty
+[submodule "third_party/libcudacxx"]
+	path = third_party/libcudacxx
+	url = https://github.com/NVIDIA/libcudacxx
+[submodule "third_party/thrust"]
+	path = third_party/thrust
+	url = https://github.com/NVIDIA/thrust.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -75,10 +75,14 @@ message(CMAKE_CUDA_FLAGS="${CMAKE_CUDA_FLAGS}")
 
 include_directories(
   ${PROJECT_SOURCE_DIR}/include
-  ${PROJECT_SOURCE_DIR}/tests/googletest/googletest/include
+  ${PROJECT_SOURCE_DIR}/third_party/libcudacxx/include
+  ${PROJECT_SOURCE_DIR}/third_party/thrust/include
+  ${PROJECT_SOURCE_DIR}/third_party/googletest/googletest/include
 )
 
-ADD_SUBDIRECTORY(tests/googletest)
+ADD_SUBDIRECTORY(third_party/googletest)
+ADD_SUBDIRECTORY(third_party/libcudacxx)
+ADD_SUBDIRECTORY(third_party/thrust)
 
 link_directories(
 )
diff --git a/third_party/googletest b/third_party/googletest
diff --git a/third_party/libcudacxx b/third_party/libcudacxx
@@ -0,0 +1 @@
+Subproject commit 88a91da3dddf0eccf7c9ffd66214ddd2cad497da
diff --git a/third_party/thrust b/third_party/thrust
@@ -0,0 +1 @@
+Subproject commit cf0fc2129f82cca026b1ef1c53d5facb35d06c4e

Original file line number	Diff line number	Diff line change
`@@ -75,10 +75,14 @@ message(CMAKE_CUDA_FLAGS="${CMAKE_CUDA_FLAGS}")`
`75`	`75`
`76`	`76`	`include_directories(`
`77`	`77`	`${PROJECT_SOURCE_DIR}/include`
`78`		`- ${PROJECT_SOURCE_DIR}/tests/googletest/googletest/include`
	`78`	`+ ${PROJECT_SOURCE_DIR}/third_party/libcudacxx/include`
	`79`	`+ ${PROJECT_SOURCE_DIR}/third_party/thrust/include`
	`80`	`+ ${PROJECT_SOURCE_DIR}/third_party/googletest/googletest/include`
`79`	`81`	`)`
`80`	`82`
`81`		`-ADD_SUBDIRECTORY(tests/googletest)`
	`83`	`+ADD_SUBDIRECTORY(third_party/googletest)`
	`84`	`+ADD_SUBDIRECTORY(third_party/libcudacxx)`
	`85`	`+ADD_SUBDIRECTORY(third_party/thrust)`
`82`	`86`
`83`	`87`	`link_directories(`
`84`	`88`	`)`