Fixed cmake and submodules

rapidsai · Sep 13, 2019 · 273b932 · 273b932
1 parent e8b37aa
commit 273b932
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 4 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -2,8 +2,8 @@
 	path = cpp/thirdparty/cnmem
 	url = https://github.com/NVIDIA/cnmem.git
 [submodule "cpp/nvgraph/cpp/thirdparty/cub"]
-	path = cpp/nvgraph/cpp/thirdparty/cub
+	path = cpp/thirdparty/cub
 	url = https://github.com/NVlabs/cub.git
 [submodule "cpp/nvgraph/external/cusp"]
-	path = cpp/nvgraph/external/cusp
+	path = external/cusp
 	url = https://github.com/cusplibrary/cusplibrary.git
diff --git a/README.md b/README.md
@@ -34,7 +34,7 @@ It is easy to install nvGraph from source. As a convenience, a `build.sh` script
   git clone https://github.com/rapidsai/nvgraph.git
   cd nvgraph
   export CUDA_ROOT=/usr/local/cuda
-  ./build.sh  # build the nvGraph library and install it to $CUDA_ROOT
+  ./build.sh  # build the nvGraph library and install it to $CUDA_ROOT (you may need to add the sudo prefix)
   ```
 
 

diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -58,6 +58,10 @@ if(CMAKE_COMPILER_IS_GNUCXX)
     endif(CMAKE_CXX11_ABI)
 endif(CMAKE_COMPILER_IS_GNUCXX)
 
+if(NOT DEFINED NVGRAPH_LIGHT)
+    set(NVGRAPH_LIGHT True)
+endif(NOT DEFINED NVGRAPH_LIGHT)
+
 ###################################################################################################
 # - cmake modules ---------------------------------------------------------------------------------
 

diff --git a/cpp/tests/CMakeLists.txt b/cpp/tests/CMakeLists.txt
@@ -8,7 +8,7 @@ project(CUDF_TESTS LANGUAGES C CXX CUDA)
 function(ConfigureTest CMAKE_TEST_NAME CMAKE_TEST_SRC)
     add_executable(${CMAKE_TEST_NAME} ${CMAKE_TEST_SRC})
     set_target_properties(${CMAKE_TEST_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
-    target_link_libraries(${CMAKE_TEST_NAME} gmock gtest gmock_main gtest_main pthread nvgraph_rapids cublas cusparse curand cusolver cudart)
+    target_link_libraries(${CMAKE_TEST_NAME} gmock gtest gmock_main gtest_main pthread nvgraph cublas cusparse curand cusolver cudart)
     set_target_properties(${CMAKE_TEST_NAME} PROPERTIES
                             RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/gtests")
     add_test(NAME ${CMAKE_TEST_NAME} COMMAND ${CMAKE_TEST_NAME})

diff --git a/cpp/nvgraph/cpp/thirdparty/cub → cpp/thirdparty/cub b/cpp/nvgraph/cpp/thirdparty/cub → cpp/thirdparty/cub
diff --git a/cpp/nvgraph/external/cusp → external/cusp b/cpp/nvgraph/external/cusp → external/cusp