merge with master

Author: ravjotbrar

CMakeLists.txt

@@ -665,10 +665,6 @@ list(APPEND WARPDRIVE_SHARED_INSTALL_INTERFACE_LIBS odbcabstraction)
 
 # Add include directories for _only_ the ODBCAbstraction SPI.
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/ODBCAbstraction-prefix/src/ODBCAbstraction/odbcabstraction/include)
-include_directories(${CMAKE_CURRENT_BINARY_DIR}/ODBCAbstraction-prefix/src/ODBCAbstraction-build/_deps/spdlog-src/include)
-
-# Ensure fmt is loaded as header only
-add_compile_definitions(FMT_HEADER_ONLY)
 
 #
 # Linker and Dependencies

src/arrow-odbc/CMakeLists.txt

@@ -34,9 +34,6 @@ find_package(OpenSSL REQUIRED)
 # Add gRPC dependencies needed by Arrow Flight. Should be pre-installed.
 find_package(gRPC 1.36 CONFIG REQUIRED)
 
-# Ensure fmt is loaded as header only
-add_compile_definitions(FMT_HEADER_ONLY)
-
 # Define the version number information.
 if(DEFINED ENV{WARPDRIVE_BUILD_VERSION})
   set(WARPDRIVE_BUILD_VERSION "$ENV{WARPDRIVE_BUILD_VERSION}")
@@ -156,10 +153,10 @@ include_directories(arrow-odbc
   ${CMAKE_CURRENT_BINARY_DIR}/../warpdrive
   ${CMAKE_CURRENT_BINARY_DIR}/../../ODBCAbstraction-prefix/src/ODBCAbstraction/flight_sql/include
   ${CMAKE_CURRENT_BINARY_DIR}/../../ODBCAbstraction-prefix/src/ODBCAbstraction/odbcabstraction/include
-  ${CMAKE_CURRENT_BINARY_DIR}/../../ODBCAbstraction-prefix/src/ODBCAbstraction-build/_deps/spdlog-src/include
   ${ODBC_INCLUDE_DIRS}
   ${Boost_INCLUDE_DIRS}
 )
 
 link_directories(${BUILD_OUTPUT_ROOT_DIRECTORY})
-configure_file(arrow-odbc.ini.in ${BUILD_OUTPUT_ROOT_DIRECTORY}/arrow-odbc.ini @ONLY)
+
+#target_link_libraries(FirstTest gtest gtest_main pthread)

src/arrow-odbc/arrow-odbc.ini.in

@@ -14,9 +14,6 @@ add_dependencies(warpdrive-all
 # Enable unicode driver build
 add_compile_definitions(UNICODE_SUPPORT)
 
-# Ensure fmt is loaded as header only
-add_compile_definitions(FMT_HEADER_ONLY)
-
 include_directories(${ODBC_INCLUDE_DIRS})
 
 
@@ -144,7 +141,6 @@ add_dependencies(warpdrive ${WARPDRIVE_LIBRARIES})
 add_dependencies(warpdrive ODBCAbstraction)
 include_directories(warpdrive
   ${CMAKE_CURRENT_BINARY_DIR}/../../ODBCAbstraction-prefix/src/ODBCAbstraction/odbcabstraction/include
-  ${CMAKE_CURRENT_BINARY_DIR}/../../ODBCAbstraction-prefix/src/ODBCAbstraction-build/_deps/spdlog-src/include
   ${Boost_INCLUDE_DIRS}
 )
 

src/warpdrive/CMakeLists.txt

@@ -31,8 +31,6 @@
 #include "loadlib.h"
 #include "new_driver.h"
 #include <odbcabstraction/odbc_impl/ODBCEnvironment.h>
-#include <odbcabstraction/spi/driver.h>
-#include <odbcabstraction/logger.h>
 
 
 /* The one instance of the handles */
@@ -73,13 +71,10 @@ namespace {
 	static std::mutex s_driverLock;
 
 void InitializeDriverIfNeeded() {
-  std::lock_guard<std::mutex> lock(s_driverLock);
-  if (s_driver == nullptr) {
-    s_driver = CreateDriver();
-    s_driver->RegisterLog();
-
-    LOG_DEBUG("Driver initialized");
-  }
+	std::lock_guard<std::mutex> lock(s_driverLock);
+	if (s_driver == nullptr) {
+		s_driver = CreateDriver();
+	}
 }
 }