Simplify CMake botan handling

Use the CMake builtin botan configuration for finding botan

Set BOTAN_LIBRARY based on static or shared library

Update docker

Author: Phatcat

CMakeLists.txt

@@ -99,7 +99,17 @@ set(version_file "${CMAKE_CURRENT_BINARY_DIR}/Version.cpp")
 ##############################
 #            Botan           #
 ##############################
-find_package(Botan 2.14.0 REQUIRED)
+find_package(Botan REQUIRED)
+# Check if the static target exists; otherwise fallback to the shared target.
+if(TARGET Botan::Botan-static)
+  set(BOTAN_LIBRARY Botan::Botan-static)
+  message(STATUS "Using Botan static library")
+elseif(TARGET Botan::Botan)
+  set(BOTAN_LIBRARY Botan::Botan)
+  message(STATUS "Using Botan shared library")
+else()
+  message(FATAL_ERROR "No valid Botan target found")
+endif()
 include_directories(${BOTAN_INCLUDE_DIRS})
 
 ##############################

Dockerfile

@@ -22,7 +22,7 @@ RUN apt-get -y update && apt-get -y upgrade \
  && apt-get -y install cmake \
  && apt-get -y install git \
  # Install required library packages
- && apt-get install -y libbotan-2-dev \
+ && apt-get install -y libbotan-3-dev \
  && apt-get install -y libmysqlcppconn-dev \
  && apt-get install -y zlib1g-dev \
  && apt-get install -y libpcre3-dev \
@@ -31,7 +31,11 @@ RUN apt-get -y update && apt-get -y upgrade \
  && tar -zxf boost_1_87_0.tar.gz \
  && cd boost_1_87_0 \
  && ./bootstrap.sh --with-libraries=system,program_options,headers \
- && ./b2 link=static install -d0 -j 2 cxxflags="-std=c++23"
+ && ./b2 link=static install -d0 -j 2 cxxflags="-std=c++23" \
+ # Create the missing botan include folder for the cmake config file
+ && mkdir -p /usr/lib/include \
+ && rm -rf /usr/lib/include/botan-3 \
+ && cp -R /usr/include/botan-3 /usr/lib/include/botan-3
 
 # Copy source
 ARG working_dir=/usr/src/ember
@@ -54,8 +58,6 @@ RUN --mount=type=cache,target=build \
     -DBUILD_OPT_TOOLS=${build_optional_tools} \
     -DPCRE_STATIC_LIB=${pcre_static_lib} \
     -DDISABLE_EMBER_THREADS=${disable_threads} \
-    -DBOTAN_ROOT_DIR=/usr/include/botan-2/ \
-    -DBOTAN_LIBRARY=/usr/lib/x86_64-linux-gnu/libbotan-2.so \
     && cd build && make -j$(nproc) install \
     && cp -r ${working_dir}/tests/ . \
     && make test
@@ -65,7 +67,7 @@ ARG install_dir=/usr/local/bin
 ARG working_dir=/usr/src/ember
 WORKDIR ${install_dir}
 RUN apt-get -y update \
- && apt-get install -y libbotan-2-19 \
+ && apt-get install -y libbotan-3-7 \
  && apt-get install -y libmysqlcppconn7v5 \
  && apt-get install -y mysql-client
 COPY --from=builder ${install_dir} ${install_dir}