Merge pull request #28 from riptano/CPP-847

CPP-847 - Add CentOS 8 support

Author: mikefero

build.yaml

@@ -21,7 +21,7 @@ schedules:
       include: ["/CPP-\\d+/", "master"]
     matrix:
       exclude:
-        - os: ['ubuntu/trusty64/cpp', 'ubuntu/xenial64/cpp', 'centos/6-64/cpp', 'centos/7-64/cpp', 'osx/high-sierra']
+        - os: ['ubuntu/trusty64/cpp', 'ubuntu/xenial64/cpp', 'centos/6-64/cpp', 'centos/7-64/cpp', 'centos/8-64/cpp', 'osx/high-sierra']
     env_vars: |
       CI_SCHEDULE=nightly
       CI_INTEGRATION_ENABLED=true
@@ -33,6 +33,7 @@ os:
   - ubuntu/xenial64/cpp
   - centos/6-64/cpp
   - centos/7-64/cpp
+  - centos/8-64/cpp
   - osx/high-sierra
 env:
   LIBUV_VERSION: 1.34.0

cmake/Dependencies.cmake

@@ -40,8 +40,6 @@ if(LIBUV_VERSION VERSION_LESS "1.6")
     "memory allocators (version 1.6 or greater required)")
 endif()
 
-list(APPEND PC_REQUIRED_LIBS "libuv")
-
 # Assign libuv include and libraries
 set(CASS_INCLUDES ${CASS_INCLUDES} ${LIBUV_INCLUDE_DIRS})
 set(CASS_LIBS ${CASS_LIBS} ${LIBUV_LIBRARIES})
@@ -103,12 +101,6 @@ if(CASS_USE_OPENSSL)
     message(STATUS "${openssl_name} version: v${OPENSSL_VERSION}")
   endif()
 
-  # FIXME: "openssl" isn't correct
-  #  # Set pkg_config required libraries
-  #  if (CASS_USE_OPENSSL)
-  #    set(PC_REQUIRED_LIBS "${PC_REQUIRED_LIBS} openssl")
-  #  endif()
-
   set(CASS_INCLUDES ${CASS_INCLUDES} ${OPENSSL_INCLUDE_DIR})
   set(CASS_LIBS ${CASS_LIBS} ${OPENSSL_LIBRARIES})
 endif()

packaging/cassandra.pc.in

@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: cassandra
 Description: A C/C++ client driver for Apache Cassandra and DataStax Products
 Version: @version@
-Libs: -L${libdir} -l@PROJECT_LIB_NAME@
+Libs: -L${libdir} -lcassandra
 Cflags:
 URL: https://github.com/datastax/cpp-driver/

packaging/cassandra_static.pc.in

@@ -6,7 +6,8 @@ includedir=@includedir@
 Name: cassandra
 Description: A C/C++ client driver for Apache Cassandra and DataStax Products
 Version: @version@
-Requires: @PC_REQUIRED_LIBS@
-Libs: -L${libdir} -l@PROJECT_LIB_NAME_STATIC@ -lstdc++
+Requires: libuv
+Requires: openssl
+Libs: -L${libdir} -lcassandra_static -lstdc++
 Cflags:
 URL: https://github.com/datastax/cpp-driver/

packaging/debian/cassandra_static.pc

@@ -7,6 +7,7 @@ Name: cassandra_static
 Description: A C/C++ client driver for Apache Cassandra and DataStax Products
 Version: @DEB_VERSION_UPSTREAM@
 Requires: libuv
+Requires: openssl
 Libs: -L${libdir} -lcassandra_static -lstdc++
 Cflags:
 URL: https://github.com/datastax/cpp-driver/