Merge branch 'branch-0.7' into sssp_stdout

rlratzel · Mar 20, 2019 · 516da93 · 516da93
2 parents 8324dc4 + 6c16194
commit 516da93
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,8 +9,7 @@
 ...
 
 ## Bug Fixes
-
-...
+- PR #169 Disable terminal output in sssp 
 
 # cuGraph 0.6.0 (Date TBD)
 
@@ -53,7 +52,7 @@
 - PR #120 Bug fix for segfault calling spectral clustering with only edge list
 - PR #123 Fixed weighted Jaccard to assume the input weights are given as a cudf.Series
 - PR #152 Fix conda package version string
-- PR #169 Disable terminal output in sssp 
+- PR #160 Added additional link directory to support building on CentOS-7
 
 # cuGraph 0.5.0 (28 Jan 2019)
 
diff --git a/cpp/cmake/Modules/ConfigureGoogleTest.cmake b/cpp/cmake/Modules/ConfigureGoogleTest.cmake
@@ -64,3 +64,5 @@ set(GTEST_ROOT ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/thirdparty/googletest
 message(STATUS "GTEST_ROOT: " ${GTEST_ROOT})
 
 link_directories(${GTEST_ROOT}/lib/)
+# FIXME: lib64 also needs to be added for CentOS-7. This might be a code smell - investigate.
+link_directories(${GTEST_ROOT}/lib64/)