Merge remote-tracking branch 'riptano/1.10.1_prep' into 2.14.1_prep_merge

Author: Michael Penick

CMakeLists.txt

@@ -151,12 +151,6 @@ if(CASS_BUILD_STATIC)
     set(PC_REQUIRED_LIBS "${PC_REQUIRED_LIBS} openssl")
   endif()
 
-  # Update the test flags to indicate the use of the static library
-  if(CASS_USE_STATIC_LIBS)
-    set(TEST_CXX_FLAGS "${TEST_CXX_FLAGS} -DCASS_STATIC")
-    set(CASS_TEST_CXX_FLAGS "${CASS_TEST_CXX_FLAGS} -DCASS_STATIC")
-  endif()
-
   set_property(TARGET ${PROJECT_LIB_NAME_STATIC} PROPERTY FOLDER "Driver/Cassandra")
 endif()
 

appveyor.ps1

@@ -63,7 +63,6 @@ Function Build-Configuration-Information {
   $output = @"
 Visual Studio: $($Env:CMAKE_GENERATOR.Split(" ")[-2]) [$($Env:CMAKE_GENERATOR.Split(" ")[-1])]
 Architecture:  $($Env:Platform)
-Boost:         v$($Env:BOOST_VERSION)
 libssh2:       v$($Env:LIBSSH2_VERSION)
 libuv:         v$($Env:LIBUV_VERSION)
 OpenSSL:       v$(Get-OpenSSL-Version)
@@ -112,7 +111,6 @@ Function Environment-Information {
 
 Function Initialize-Build-Environment {
   # Get the versions for the third party dependencies
-  $boost_version = $Env:BOOST_VERSION
   $libssh2_version = $Env:LIBSSH2_VERSION
   $libuv_version = $Env:LIBUV_VERSION
   $openssl_version = Get-OpenSSL-Version
@@ -179,17 +177,15 @@ Function Initialize-Build-Environment {
   }
 
   # Generate default environment variables for per commit builds
-  $boost_version_filename = "$($boost_version.Replace(".", "_"))"
+  If ($Env:APPVEYOR_BUILD_WORKER_IMAGE -Like "Visual Studio 2019") {
+    $boost_version_directory_suffix = "1_71_0"
+  } Else {
+    $boost_version_directory_suffix = "1_69_0"
+  }
   $visual_studio_version = "$($Env:VISUAL_STUDIO_INTERNAL_VERSION.Insert(2, "."))"
 
   # Generate the default Boost environment variables
-  $Env:BOOST_ROOT = "C:/Libraries/boost_$($boost_version_filename)"
-  $Env:BOOST_LIBRARYDIR = "$($Env:BOOST_ROOT)/$($lib_architecture)-msvc-$($visual_studio_version)"
-  If (-Not (Test-Path -Path "$($Env:BOOST_LIBRARYDIR)")) {
-    # Update the Boost environment variables for CMake to find installation
-    $Env:BOOST_ROOT = "$($libs_location_prefix)/boost-$($boost_version)"
-    $Env:BOOST_LIBRARYDIR = "$($Env:BOOST_ROOT)/$($lib_architecture)-msvc-$($visual_studio_version)"
-  }
+  $Env:BOOST_ROOT = "C:/Libraries/boost_$($boost_version_directory_suffix)"
   $Env:BOOST_INCLUDEDIR = "$($Env:BOOST_ROOT)/include"
 
   # Generate the default libssh2 environment variables
@@ -509,55 +505,6 @@ add_dependencies(`${PROJECT_NAME} `${ZLIB_LIBRARY_NAME})
     }
   }
 
-  # Handle installation of the per commit dependencies (e.g. Test builds)
-  # Determine if Boost should be installed (pre-installed or cached)
-  If (-Not (Test-Path -Path "$($Env:BOOST_LIBRARYDIR)")) {
-    New-Item -ItemType Directory -Force -Path "$($dependencies_build_location_prefix)/boost" | Out-Null
-    Push-Location -Path "$($dependencies_build_location_prefix)/boost"
-
-    $cmakelists_contents = @"
-cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
-project(Boost)
-set(PROJECT_DISPLAY_NAME "AppVeyor CI Build for Boost")
-set(PROJECT_MODULE_DIR $cmake_modules_dir)
-set(CMAKE_MODULE_PATH `${CMAKE_MODULE_PATH} `${PROJECT_MODULE_DIR})
-include(ExternalProject-boost)
-set(GENERATED_SOURCE_FILE `${CMAKE_CURRENT_BINARY_DIR}/main.cpp)
-file(REMOVE `${GENERATED_SOURCE_FILE})
-file(WRITE `${GENERATED_SOURCE_FILE} "int main () { return 0; }")
-add_executable(`${PROJECT_NAME} `${GENERATED_SOURCE_FILE})
-add_dependencies(`${PROJECT_NAME} `${BOOST_LIBRARY_NAME})
-"@
-    $cmakelists_contents | Out-File -FilePath "CMakeLists.txt" -Encoding Utf8 -Force
-
-    Write-Host "Configuring Boost"
-    cmake -G "$($Env:CMAKE_GENERATOR)" -A $Env:CMAKE_PLATFORM "-DBOOST_VERSION=$($Env:BOOST_VERSION)" "-DBOOST_INSTALL_PREFIX=$($Env:BOOST_ROOT)" .
-    If ($LastExitCode -ne 0) {
-      If (Test-Path -Path "build/CMakeFiles/CMakeOutput.log") {
-        Push-AppveyorArtifact "build/CMakeFiles/CMakeOutput.log" -DeploymentName "Boost Output Log"
-      }
-      If (Test-Path -Path "build/CMakeFiles/CMakeError.log") {
-        Push-AppveyorArtifact "build/CMakeFiles/CMakeError.log" -DeploymentName "Boost Error Log"
-      }
-      Pop-Location
-      Throw "Failed to configure Boost for MSVC $($Env:VISUAL_STUDIO_INTERNAL_VERSION)-$($Env:Platform)"
-    }
-    Write-Host "Building and Installing Boost"
-    cmake --build . --config RelWithDebInfo
-    If ($LastExitCode -ne 0) {
-      If (Test-Path -Path "build/CMakeFiles/CMakeOutput.log") {
-        Push-AppveyorArtifact "build/CMakeFiles/CMakeOutput.log" -DeploymentName "Boost Output Log"
-      }
-      If (Test-Path -Path "build/CMakeFiles/CMakeError.log") {
-        Push-AppveyorArtifact "build/CMakeFiles/CMakeError.log" -DeploymentName "Boost Error Log"
-      }
-      Pop-Location
-      Throw "Failed to build Boost for MSVC $($Env:VISUAL_STUDIO_INTERNAL_VERSION)-$($Env:Platform)"
-    }
-
-    Pop-Location
-  }
-
   # Determine if libssh2 should be installed (cached)
   If (-Not (Test-Path -Path "$($Env:LIBSSH2_ROOT_DIR)/lib")) { # lib directory checked due to external project being CMake (automatically creates root directory)
     New-Item -ItemType Directory -Force -Path "$($dependencies_build_location_prefix)/libssh2" | Out-Null

appveyor.yml

@@ -37,7 +37,6 @@ environment:
     secure: h28bN22Py3CZPqrWoZWEjIFnpes+kslusCKP1mRYdUqBEf+OO1kFEQTZ9DGD7tuCSIIRDI3Mf9LX8zgUdmdlZA==
   APPVEYOR_IGNORE_COMMIT_FILTERING_ON_TAG: true
   DRIVER_TYPE: CASS
-  BOOST_VERSION: 1.69.0
   LIBSSH2_VERSION: 1.9.0
   LIBUV_VERSION: 1.33.0
   OPENSSL_1_0_VERSION: 1.0.2s
@@ -88,12 +87,10 @@ environment:
       OPENSSL_MAJOR_MINOR: 1.0
       VISUAL_STUDIO_INTERNAL_VERSION: 142
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-      BOOST_VERSION: 1.70.0
 #    - CMAKE_GENERATOR: Visual Studio 16 2019
 #      OPENSSL_MAJOR_MINOR: 1.1
 #      VISUAL_STUDIO_INTERNAL_VERSION: 142
 #      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-#      BOOST_VERSION: 1.70.0
 #init:
 #  - ps: iex ((New-Object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
 install:

bin/README.md

@@ -88,13 +88,13 @@ endmacro()
 # CassOptionalDependencies
 #
 # Configure enabled optional dependencies if found or if Windows use an
-# external project to build Boost, OpenSSL, zlib.
+# external project to build OpenSSL and zlib.
 #
 # Output: CASS_INCLUDES and CASS_LIBS
 #------------------------
 macro(CassOptionalDependencies)
   # Boost
-  if(CASS_USE_BOOST_ATOMIC OR CASS_BUILD_INTEGRATION_TESTS)
+  if(CASS_USE_BOOST_ATOMIC)
     CassUseBoost()
   endif()
 
@@ -147,22 +147,22 @@ macro(CassConfigureShared prefix)
   set_target_properties(${PROJECT_LIB_NAME} PROPERTIES
       COMPILE_PDB_NAME "${PROJECT_LIB_NAME}"
       COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
-  set(STATIC_COMPILE_FLAGS "-D${prefix}_BUILDING")
+  set(SHARED_COMPILE_FLAGS "-D${prefix}_BUILDING")
   if("${prefix}" STREQUAL "DSE")
-    set(STATIC_COMPILE_FLAGS "${STATIC_COMPILE_FLAGS} -DCASS_BUILDING")
+    set(SHARED_COMPILE_FLAGS "${SHARED_COMPILE_FLAGS} -DCASS_BUILDING")
   endif()
   if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
     set_property(
         TARGET ${PROJECT_LIB_NAME}
-        APPEND PROPERTY COMPILE_FLAGS "${STATIC_COMPILE_FLAGS} -Wconversion -Wno-sign-conversion -Wno-shorten-64-to-32 -Wno-undefined-var-template -Werror")
+        APPEND PROPERTY COMPILE_FLAGS "${SHARED_COMPILE_FLAGS} -Wconversion -Wno-sign-conversion -Wno-shorten-64-to-32 -Wno-undefined-var-template -Werror")
   elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") # To many superfluous warnings generated with GCC when using -Wconversion (see: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=40752)
     set_property(
         TARGET ${PROJECT_LIB_NAME}
-        APPEND PROPERTY COMPILE_FLAGS "${STATIC_COMPILE_FLAGS} -Werror")
+        APPEND PROPERTY COMPILE_FLAGS "${SHARED_COMPILE_FLAGS} -Werror")
   elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
     set_property(
         TARGET ${PROJECT_LIB_NAME}
-        APPEND PROPERTY COMPILE_FLAGS "${STATIC_COMPILE_FLAGS} /we4800")
+        APPEND PROPERTY COMPILE_FLAGS "${SHARED_COMPILE_FLAGS} /we4800")
   endif()
 endmacro()
 
@@ -204,8 +204,8 @@ macro(CassConfigureStatic prefix)
 
   # Update the CXX flags to indicate the use of the static library
   if(${prefix}_USE_STATIC_LIBS)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${STATIC_COMPILE_FLAGS}")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${STATIC_COMPILE_FLAGS}")
+    set(TEST_CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${STATIC_COMPILE_FLAGS}") # Unit and integration test executables
+    set(EXAMPLE_CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${STATIC_COMPILE_FLAGS}") # Example executables
   endif()
 endmacro()
 
@@ -383,15 +383,8 @@ endmacro()
 # Input: CASS_BUILD_INTEGRATION_TESTS, CASS_BUILD_UNIT_TESTS, CASS_ROOT_DIR
 #------------------------
 macro(CassConfigureTests)
-  if(CASS_BUILD_INTEGRATION_TESTS)
-    # Add CCM bridge as a dependency for integration tests
-    set(CCM_BRIDGE_INCLUDES "${CASS_ROOT_DIR}/test/ccm_bridge/src")
-    add_subdirectory(${CASS_ROOT_DIR}/test/ccm_bridge)
-    add_subdirectory(${CASS_ROOT_DIR}/test/integration_tests)
-  endif()
-
   if (CASS_BUILD_INTEGRATION_TESTS OR CASS_BUILD_UNIT_TESTS)
-    add_subdirectory(${CASS_ROOT_DIR}/gtests)
+    add_subdirectory(${CASS_ROOT_DIR}/tests)
   endif()
 endmacro()
 
@@ -427,20 +420,32 @@ macro(CassUseLibuv)
     message(FATAL_ERROR "Unable to Locate libuv: libuv v1.0.0+ is required")
   endif()
 
-  if (LIBUV_VERSION VERSION_LESS "1.0")
+  if(LIBUV_VERSION VERSION_LESS "1.0")
     message(FATAL_ERROR "Libuv version ${LIBUV_VERSION} is not "
       " supported. Please updgrade to libuv version 1.0 or greater in order to "
       "utilize the driver.")
   endif()
 
-  if (LIBUV_VERSION VERSION_LESS "1.6")
+  if(LIBUV_VERSION VERSION_LESS "1.6")
     message(WARNING "Libuv version ${LIBUV_VERSION} does not support custom "
     "memory allocators (version 1.6 or greater required)")
   endif()
 
   # Assign libuv include and libraries
   set(CASS_INCLUDES ${CASS_INCLUDES} ${LIBUV_INCLUDE_DIRS})
   set(CASS_LIBS ${CASS_LIBS} ${LIBUV_LIBRARIES})
+
+  # libuv and gtests require thread library
+  set(CMAKE_THREAD_PREFER_PTHREAD 1)
+  set(THREADS_PREFER_PTHREAD_FLAG 1)
+  find_package(Threads REQUIRED)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_THREAD_LIBS_INIT}")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_THREAD_LIBS_INIT}")
+  if(NOT WIN32 AND ${CMAKE_VERSION} VERSION_LESS "3.1.0")
+    # FindThreads in CMake versions < v3.1.0 do not have the THREADS_PREFER_PTHREAD_FLAG to prefer -pthread
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread")
+  endif()
 endmacro()
 
 #------------------------
@@ -515,38 +520,13 @@ macro(CassHttpParser)
   include_directories(${HTTP_PARSER_INCLUDE_DIR})
 endmacro()
 
-#------------------------
-# CassSimulacron
-#
-# Set up Simulacron for use in tests.
-#
-# Input: TESTS_SIMULACRON_SERVER_DIR
-# Output: SIMULACRON_SERVER_JAR
-#------------------------
-macro(CassSimulacron)
-  # Determine if Simulacron server can be executed (Java runtime is available)
-  find_package(Java COMPONENTS Runtime)
-  if(Java_Runtime_FOUND)
-    # Determine the Simulacron jar file
-    file(GLOB SIMULACRON_SERVER_JAR
-      ${TESTS_SIMULACRON_SERVER_DIR}/simulacron-standalone-*.jar)
-  endif()
-
-  # Determine if the Simulacron server will be available for the tests
-  if(NOT EXISTS ${SIMULACRON_SERVER_JAR})
-    message(WARNING "Simulacron Not Found: Simulacron support will be disabled")
-  endif()
-endmacro()
-
-
 #------------------------
 # CassUseBoost
 #
-# Add includes, libraries, define flags required for using Boost if found or if
-# Windows use an external project to build Boost.
+# Add includes and define flags required for using Boost if found.
 #
-# Input: CASS_USE_STATIC_LIBS, CASS_USE_BOOST_ATOMIC, CASS_INCLUDES, CASS_LIBS
-# Output: CASS_INCLUDES and CASS_LIBS
+# Input: CASS_USE_BOOST_ATOMIC, CASS_INCLUDES
+# Output: CASS_INCLUDES
 #------------------------
 macro(CassUseBoost)
   # Allow for boost directory to be specified on the command line
@@ -568,64 +548,15 @@ macro(CassUseBoost)
     add_definitions(-DBOOST_ALL_NO_LIB)
   endif()
 
-  # Determine if shared or static boost libraries should be used
-  if(CASS_USE_STATIC_LIBS OR
-     (WIN32 AND CASS_BUILD_INTEGRATION_TESTS)) # Force the use of Boost static libraries for Windows (e.g. executables)
-    set(Boost_USE_STATIC_LIBS ON)
-  else()
-    set(Boost_USE_STATIC_LIBS OFF)
-    add_definitions(-DBOOST_ALL_DYN_LINK)
-  endif()
-  set(Boost_USE_STATIC_RUNTIME OFF)
-  set(Boost_USE_MULTITHREADED ON)
-  add_definitions(-DBOOST_THREAD_USES_MOVE)
-
   # Check for general Boost availability
   find_package(Boost ${CASS_MINIMUM_BOOST_VERSION} QUIET)
-  if ((WIN32 AND NOT Boost_FOUND) AND
-      (CASS_USE_BOOST_ATOMIC OR CASS_BUILD_INTEGRATION_TESTS))
-    message(STATUS "Unable to Locate Boost: Third party build step will be performed")
-    include(ExternalProject-Boost)
-  else()
-    message(STATUS "Boost version: v${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}")
-    # Ensure the driver components exist (optional)
-    if(CASS_USE_BOOST_ATOMIC)
-      if(NOT Boost_INCLUDE_DIRS)
-        message(FATAL_ERROR "Boost headers required to build driver because of -DCASS_USE_BOOST_ATOMIC=On")
-      endif()
-
-      # Assign Boost include for atomics
-      set(CASS_INCLUDES ${CASS_INCLUDES} ${Boost_INCLUDE_DIRS})
+  if(CASS_USE_BOOST_ATOMIC)
+    if(NOT Boost_INCLUDE_DIRS)
+      message(FATAL_ERROR "Boost headers required to build driver because of -DCASS_USE_BOOST_ATOMIC=On")
     endif()
 
-    # Determine if Boost components are available for test executables
-    if(CASS_BUILD_INTEGRATION_TESTS)
-      # Handle new required version of CMake for Boost v1.66.0 (Windows only)
-      if(WIN32)
-        if(Boost_FOUND)
-          if(Boost_VERSION GREATER 106600 OR Boost_VERSION EQUAL 106600)
-            # Ensure CMake version is v3.11.0+
-            if(CMAKE_VERSION VERSION_LESS 3.11.0)
-              message(FATAL_ERROR "Boost v${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION} requires CMake v3.11.0+."
-                "Updgrade CMake or downgrade Boost to v${CASS_MINIMUM_BOOST_VERSION} - v1.65.1.")
-            endif()
-          endif()
-        endif()
-      endif()
-
-      # Ensure Boost components are available
-      find_package(Boost ${CASS_MINIMUM_BOOST_VERSION} COMPONENTS chrono system thread unit_test_framework)
-      if(NOT Boost_FOUND)
-        # Ensure Boost was not found due to minimum version requirement
-        set(CASS_FOUND_BOOST_VERSION "${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}")
-        if((CASS_FOUND_BOOST_VERSION VERSION_GREATER "${CASS_MINIMUM_BOOST_VERSION}")
-          OR (CASS_FOUND_BOOST_VERSION VERSION_EQUAL "${CASS_MINIMUM_BOOST_VERSION}"))
-          message(FATAL_ERROR "Boost [chrono, system, thread, and unit_test_framework] are required to build tests")
-        else()
-          message(FATAL_ERROR "Boost v${CASS_FOUND_BOOST_VERSION} Found: v${CASS_MINIMUM_BOOST_VERSION} or greater required")
-        endif()
-      endif()
-    endif()
+    # Assign Boost include for atomics
+    set(CASS_INCLUDES ${CASS_INCLUDES} ${Boost_INCLUDE_DIRS})
   endif()
 
   # Determine if additional Boost definitions are required for driver/executables