Skip to content

Commit 0dd3bd4

Browse files
committed
build system: remove Kerberos-related code
As Kerberos is not used in the CPP-Rust Driver at all (it was used in CPP Driver for custom authentication), this commit removes all references to Kerberos from the build system.
1 parent 7bbd1ab commit 0dd3bd4

File tree

6 files changed

+0
-102
lines changed

6 files changed

+0
-102
lines changed

CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ option(CASS_INSTALL_HEADER_IN_SUBDIR "Install header file under 'include/cassand
4242
option(CASS_INSTALL_PKG_CONFIG "Install pkg-config file(s)" ON)
4343
option(CASS_MULTICORE_COMPILATION "Enable multicore compilation" ON)
4444
option(CASS_USE_BOOST_ATOMIC "Use Boost atomics library" OFF)
45-
option(CASS_USE_KERBEROS "Use Kerberos" OFF)
4645
option(CASS_USE_LIBSSH2 "Use libssh2 for integration tests" OFF)
4746
option(CASS_USE_OPENSSL "Use OpenSSL" ON)
4847
option(CASS_USE_STATIC_LIBS "Link static libraries when building executables" OFF)
@@ -64,7 +63,6 @@ endif()
6463

6564
if(CASS_BUILD_INTEGRATION_TESTS OR CASS_BUILD_UNIT_TESTS)
6665
set(CASS_USE_OPENSSL ON) # Required for tests
67-
set(CASS_USE_KERBEROS ON) # Required for tests
6866
set(CASS_USE_LIBUV ON)
6967
endif()
7068

cmake/Dependencies.cmake

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -107,17 +107,6 @@ if(CASS_USE_OPENSSL)
107107
set(CASS_LIBS ${CASS_LIBS} ${OPENSSL_LIBRARIES})
108108
endif()
109109

110-
#------------------------
111-
# Kerberos
112-
#------------------------
113-
114-
if(CASS_USE_KERBEROS)
115-
# Discover Kerberos and assign Kerberos include and libraries
116-
find_package(Kerberos REQUIRED)
117-
set(CASS_INCLUDES ${CASS_INCLUDES} ${KERBEROS_INCLUDE_DIR})
118-
set(CASS_LIBS ${CASS_LIBS} ${KERBEROS_LIBRARIES})
119-
endif()
120-
121110
#------------------------
122111
# Boost
123112
#------------------------

cmake/FindKerberos.cmake

Lines changed: 0 additions & 81 deletions
This file was deleted.

driver_config.hpp.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#ifndef DATASTAX_INTERNAL_DRIVER_CONFIG_HPP
22
#define DATASTAX_INTERNAL_DRIVER_CONFIG_HPP
33

4-
#cmakedefine HAVE_KERBEROS
54
#cmakedefine HAVE_OPENSSL
65
#cmakedefine HAVE_STD_ATOMIC
76
#cmakedefine CASS_CPP_STANDARD @CASS_CPP_STANDARD@

src/CMakeLists.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@ else()
1717
list(APPEND SOURCES ssl/ssl_no_impl.cpp)
1818
endif()
1919

20-
if(CASS_USE_KERBEROS)
21-
list(APPEND INCLUDE_DIRS gssapi)
22-
list(APPEND SOURCES gssapi/dse_auth_gssapi.cpp gssapi/dse_auth_gssapi.hpp)
23-
endif()
24-
2520
# Determine atomic library to include
2621
if(CASS_USE_BOOST_ATOMIC)
2722
list(APPEND SOURCES atomic/atomic_boost.hpp)
@@ -122,7 +117,6 @@ endif()
122117

123118
set(HAVE_BOOST_ATOMIC ${CASS_USE_BOOST_ATOMIC})
124119
set(HAVE_STD_ATOMIC ${CASS_USE_STD_ATOMIC})
125-
set(HAVE_KERBEROS ${CASS_USE_KERBEROS})
126120
set(HAVE_OPENSSL ${CASS_USE_OPENSSL})
127121

128122
# Generate the driver_config.hpp file

src/driver_config.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#ifndef DATASTAX_INTERNAL_DRIVER_CONFIG_HPP
22
#define DATASTAX_INTERNAL_DRIVER_CONFIG_HPP
33

4-
#define HAVE_KERBEROS
54
#define HAVE_OPENSSL
65
#define HAVE_STD_ATOMIC
76
#define CASS_CPP_STANDARD 11

0 commit comments

Comments
 (0)