Browse Source

Merge pull request #8829 from richardkchapman/cassandra-2.4.1

HPCC-15805 - Update to latest (2.4.1) Cassandra driver

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>
Gavin Halliday 9 years ago
parent
commit
2185bd8882
2 changed files with 2 additions and 1 deletions
  1. 1 0
      plugins/cassandra/CMakeLists.txt
  2. 1 1
      plugins/cassandra/cpp-driver

+ 1 - 0
plugins/cassandra/CMakeLists.txt

@@ -67,6 +67,7 @@ if(USE_CASSANDRA)
   if(NOT WIN32)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-format-nonliteral") # Work around cassandra build error
   endif()
+  set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cpp-driver/cmake/modules/")
   add_subdirectory(cpp-driver ${PROJECT_BINARY_DIR}/cassandra)
   add_dependencies(cassandra libuv)
   set(CMAKE_CXX_FLAGS "${_SAVE_CMAKE_CXX_FLAGS}")

+ 1 - 1
plugins/cassandra/cpp-driver

@@ -1 +1 @@
-Subproject commit d7bbad34db39a51f209c6fadd07c9ec3a0bb86b7
+Subproject commit 468db35af8875930d424395808ddc9523c57c6f2