Use newer versions of support libraries (fixes for Hopper!). Move all…

… dependencies to dedicated folder.
NVIDIA-Merlin · May 18, 2023 · a0de3ac · a0de3ac
1 parent 63582b5
commit a0de3ac
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 3 deletions.
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
@@ -66,10 +66,14 @@ endforeach()
 
 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/tests/googletest → third_party/googletest b/tests/googletest → third_party/googletest
diff --git a/third_party/libcudacxx b/third_party/libcudacxx
diff --git a/third_party/thrust b/third_party/thrust