Adjust boost dependencies

Author: asfernandes

CMakeLists.txt

@@ -57,6 +57,17 @@ if(BUILD_TESTING)
 endif()
 
 
+set(FB_CPP_USE_BOOST_DLL_VALUE 0)
+if(FB_CPP_USE_BOOST_DLL)
+	set(FB_CPP_USE_BOOST_DLL_VALUE 1)
+endif()
+
+set(FB_CPP_USE_BOOST_MULTIPRECISION_VALUE 0)
+if(FB_CPP_USE_BOOST_MULTIPRECISION)
+	set(FB_CPP_USE_BOOST_MULTIPRECISION_VALUE 1)
+endif()
+
+
 include(CMakePackageConfigHelpers)
 write_basic_package_version_file(
 	"${CMAKE_CURRENT_BINARY_DIR}/fb-cppConfigVersion.cmake"

cmake/fb-cppConfig.cmake.in

@@ -2,12 +2,22 @@
 
 include(CMakeFindDependencyMacro)
 
-find_dependency(Boost
-	COMPONENTS
-		dll
-		multiprecision
-)
+find_dependency(firebird CONFIG)
+
+set(_fb_cpp_use_boost_dll "@FB_CPP_USE_BOOST_DLL_VALUE@")
+set(_fb_cpp_use_boost_multiprecision "@FB_CPP_USE_BOOST_MULTIPRECISION_VALUE@")
+
+if(_fb_cpp_use_boost_dll)
+	find_dependency(Boost COMPONENTS dll)
+endif()
+
+if(_fb_cpp_use_boost_multiprecision)
+	find_dependency(Boost COMPONENTS multiprecision)
+endif()
 
 include("${CMAKE_CURRENT_LIST_DIR}/fb-cppTargets.cmake")
 
+unset(_fb_cpp_use_boost_dll)
+unset(_fb_cpp_use_boost_multiprecision)
+
 check_required_components(fb-cpp)

src/fb-cpp/CMakeLists.txt

@@ -2,15 +2,29 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 project(fb-cpp CXX)
 
+option(FB_CPP_USE_BOOST_DLL "Enable Boost.DLL support for loading fbclient at runtime" ON)
+option(FB_CPP_USE_BOOST_MULTIPRECISION "Enable Boost.Multiprecision helpers for INT128 and DECFLOAT types" ON)
+
 file(GLOB_RECURSE SRC
 	"*.h"
 	"*.cpp"
 )
 
-find_package(Boost REQUIRED
-	COMPONENTS
-		multiprecision
-)
+set(_fb_cpp_boost_components "")
+if(FB_CPP_USE_BOOST_DLL)
+	list(APPEND _fb_cpp_boost_components dll)
+endif()
+if(FB_CPP_USE_BOOST_MULTIPRECISION)
+	list(APPEND _fb_cpp_boost_components multiprecision)
+endif()
+
+if(_fb_cpp_boost_components)
+	find_package(Boost REQUIRED
+		COMPONENTS ${_fb_cpp_boost_components}
+	)
+endif()
+
+find_package(firebird CONFIG REQUIRED)
 
 
 add_library(${PROJECT_NAME}
@@ -24,11 +38,43 @@ target_include_directories(${PROJECT_NAME}
 		$<INSTALL_INTERFACE:include>
 )
 
+if(NOT DEFINED FB_CPP_USE_BOOST_DLL_VALUE)
+	if(FB_CPP_USE_BOOST_DLL)
+		set(FB_CPP_USE_BOOST_DLL_VALUE 1)
+	else()
+		set(FB_CPP_USE_BOOST_DLL_VALUE 0)
+	endif()
+endif()
+
+if(NOT DEFINED FB_CPP_USE_BOOST_MULTIPRECISION_VALUE)
+	if(FB_CPP_USE_BOOST_MULTIPRECISION)
+		set(FB_CPP_USE_BOOST_MULTIPRECISION_VALUE 1)
+	else()
+		set(FB_CPP_USE_BOOST_MULTIPRECISION_VALUE 0)
+	endif()
+endif()
+
+target_compile_definitions(${PROJECT_NAME}
+	PUBLIC
+		FB_CPP_USE_BOOST_DLL=${FB_CPP_USE_BOOST_DLL_VALUE}
+		FB_CPP_USE_BOOST_MULTIPRECISION=${FB_CPP_USE_BOOST_MULTIPRECISION_VALUE}
+)
+
 target_link_libraries(${PROJECT_NAME}
-	PRIVATE Boost::multiprecision
-	${CMAKE_DL_LIBS}
+	PUBLIC
+		firebird
+	PRIVATE
+		${CMAKE_DL_LIBS}
 )
 
+if(FB_CPP_USE_BOOST_MULTIPRECISION)
+	target_link_libraries(${PROJECT_NAME}
+		PRIVATE Boost::multiprecision
+	)
+endif()
+
+unset(_fb_cpp_boost_components)
+
 file(GLOB_RECURSE HEADER_FILES
 	"${CMAKE_CURRENT_LIST_DIR}/*.h"
 	"${CMAKE_CURRENT_LIST_DIR}/*.hpp"

src/fb-cpp/Statement.h

@@ -2207,9 +2207,11 @@ namespace fbcpp
 				return std::nullopt;
 
 			auto data = &message[descriptor.offset];
+#if FB_CPP_USE_BOOST_MULTIPRECISION != 0
 			std::optional<BoostInt128> boostInt128;
 			std::optional<BoostDecFloat16> boostDecFloat16;
 			std::optional<BoostDecFloat34> boostDecFloat34;
+#endif
 
 			switch (descriptor.adjustedType)
 			{