Merge branch 'candidate-7.8.x' into candidate-7.10.x

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>

plugins/cassandra/CMakeLists.txt

@@ -74,6 +74,7 @@ if(USE_CASSANDRA)
     remove_definitions (-fsanitize=undefined -fno-sanitize=alignment -fsanitize-trap=undefined)
   endif()
   set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cpp-driver/cmake/modules/")
+  set(CMAKE_INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/${LIB_DIR}")
   set(CASS_ROOT_DIR "${PROJECT_SOURCE_DIR}/cpp-driver")
   add_subdirectory(cpp-driver ${PROJECT_BINARY_DIR}/cassandra)
   add_dependencies(cassandra libuv)