Merge remote-tracking branch 'core/master' into sync_core

Author: Michael Fero

cpp-driver/CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.6.4)
 set(CMAKE_EXPORT_COMPILE_COMMANDS TRUE)
 
 # Ensure functions/modules are available
-set(CASS_ROOT_DIR ${CMAKE_SOURCE_DIR})
+set(CASS_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 set(CASS_SRC_DIR "${CASS_ROOT_DIR}/src")
 set(CASS_INCLUDE_DIR "${CASS_ROOT_DIR}/include")
 list(APPEND CMAKE_MODULE_PATH ${CASS_ROOT_DIR}/cmake/modules)
@@ -33,6 +33,7 @@ option(CASS_BUILD_TESTS "Build tests" OFF)
 option(CASS_BUILD_UNIT_TESTS "Build unit tests" OFF)
 option(CASS_DEBUG_CUSTOM_ALLOC "Debug custom allocator" OFF)
 option(CASS_INSTALL_HEADER "Install header file" ON)
+option(CASS_INSTALL_HEADER_IN_SUBDIR "Install header file under 'include/cassandra'" OFF)
 option(CASS_INSTALL_PKG_CONFIG "Install pkg-config file(s)" ON)
 option(CASS_MULTICORE_COMPILATION "Enable multicore compilation" ON)
 option(CASS_USE_BOOST_ATOMIC "Use Boost atomics library" OFF)

cpp-driver/cmake/modules/CppDriver.cmake

@@ -234,22 +234,36 @@ macro(CassConfigureInstall var_prefix pkg_config_stem)
   # Create a binary directory executable and DLLs (windows only)
   set(INSTALL_DLL_EXE_DIR "bin")
 
+  # Determine the header install dir
+  if (CASS_INSTALL_HEADER_IN_SUBDIR)
+    if (CASS_INSTALL_HEADER_SUBDIR_NAME)
+      # User-specified include sub-dir
+      set(INSTALL_HEADER_DIR "include/${CASS_INSTALL_HEADER_SUBDIR_NAME}")
+    else()
+      # Default subdir location is 'include/cassandra'
+      set(INSTALL_HEADER_DIR "include/${PROJECT_NAME_STRING}")
+    endif()
+  else()
+    # Default header install location is 'include'
+    set(INSTALL_HEADER_DIR "include")
+  endif()
+
   if(${var_prefix}_INSTALL_PKG_CONFIG)
     if(NOT WIN32)
       find_package(PkgConfig)
       if(PKG_CONFIG_FOUND)
         set(prefix ${CMAKE_INSTALL_PREFIX})
         set(exec_prefix ${CMAKE_INSTALL_PREFIX})
         set(libdir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
-        set(includedir ${CMAKE_INSTALL_PREFIX}/include)
+        set(includedir ${CMAKE_INSTALL_PREFIX}/${INSTALL_HEADER_DIR})
         set(version ${PROJECT_VERSION_STRING})
       endif()
     endif()
   endif()
 
   # Determine if the header should be installed
   if(${var_prefix}_INSTALL_HEADER)
-    install(FILES ${${var_prefix}_API_HEADER_FILES} DESTINATION "include")
+    install(FILES ${${var_prefix}_API_HEADER_FILES} DESTINATION ${INSTALL_HEADER_DIR})
   endif()
 
   # Install the dynamic/shared library

cpp-driver/include/cassandra.h

@@ -2014,8 +2014,8 @@ cass_cluster_set_tracing_retry_wait_time(CassCluster* cluster,
  *
  * <b>Default:</b> CASS_CONSISTENCY_ONE
  *
- * @param cluster[in]
- * @param consistency[in]
+ * @param[in] cluster
+ * @param[in] consistency
  */
 CASS_EXPORT void
 cass_cluster_set_tracing_consistency(CassCluster* cluster,

cpp-driver/packaging/debian/rules

@@ -32,5 +32,8 @@ override_dh_strip:
 	sed -i s/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/ debian/cassandra-cpp-driver-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/*.pc
 	sed -i s/@DEB_VERSION_UPSTREAM@/$(DEB_VERSION_UPSTREAM)/ debian/cassandra-cpp-driver-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/*.pc
 
+override_dh_makeshlibs:
+	dh_makeshlibs -V
+
 override_dh_auto_test:
 override_dh_auto_clean: