an-tao · marty1885 · Jun 15, 2024 · Jun 16, 2024 · Jun 16, 2024 · Jun 16, 2024
diff --git a/.github/workflows/windows-msvc.yml b/.github/workflows/windows-msvc.yml
@@ -16,9 +16,7 @@ jobs:
         link: [ 'STATIC', 'SHARED' ]
         # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
         build-type: ['Debug', 'Release']
-        # TODO: conan botan is v2, v2 support is removed
-        # tls-provider: ['', 'openssl', 'botan']
-        tls-provider: ['', 'openssl']
+        tls-provider: ['', 'openssl', 'botan']
 
     steps:
       - name: Checkout Trantor source code
@@ -37,7 +35,7 @@ jobs:
         run: |
           pip install conan
           conan profile detect --force
-          conan install .. --output-folder=. --build=missing --settings=build_type=${{matrix.build-type}} --settings=compiler="msvc" --settings=compiler.version=193 
+          conan install .. --output-folder=. --build=missing --settings=build_type=${{matrix.build-type}} --settings=compiler="msvc" --options=tls_provider=${{matrix.tls-provider}} -s compiler.cppstd=20
 
       - name: Create Build Environment & Configure Cmake
         shell: bash
@@ -47,6 +45,7 @@ jobs:
         run: |
           [[ ${{ matrix.link }} == "SHARED" ]] && shared="ON" || shared="OFF"
           cmake .. -G "Visual Studio 17 2022" -T host=x64 -A x64 \
+          -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" \
           -DTRANTOR_USE_TLS=${{matrix.tls-provider}} \
           -DCMAKE_BUILD_TYPE=${{matrix.build-type}} \
           -DBUILD_SHARED_LIBS=$shared \

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -294,6 +294,13 @@ set_target_properties(${PROJECT_NAME} PROPERTIES CXX_STANDARD_REQUIRED ON)
 set_target_properties(${PROJECT_NAME} PROPERTIES CXX_EXTENSIONS OFF)
 set_target_properties(${PROJECT_NAME} PROPERTIES EXPORT_NAME Trantor)
 
+if(TRANTOR_TLS_PROVIDER STREQUAL "Botan")
+  set_target_properties(${PROJECT_NAME} PROPERTIES CXX_STANDARD 20)
+  if(CMAKE_CXX_COMPILER_ID MATCHES Clang OR CMAKE_CXX_COMPILER_ID STREQUAL GNU)
+    target_compile_options(${PROJECT_NAME} PRIVATE -Wno-deprecated)
+  endif()
+endif()
+
 if(BUILD_TESTING)
   add_subdirectory(trantor/tests)
   find_package(GTest)
@@ -383,7 +390,6 @@ install(
   FILES "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/TrantorConfig.cmake"
         "${CMAKE_CURRENT_BINARY_DIR}/TrantorConfigVersion.cmake"
         "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/Findc-ares.cmake"
-        "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/FindBotan.cmake"
   DESTINATION "${INSTALL_TRANTOR_CMAKE_DIR}"
   COMPONENT dev
 )

diff --git a/cmake_modules/FindBotan.cmake b/cmake_modules/FindBotan.cmake
diff --git a/conanfile.py b/conanfile.py
@@ -0,0 +1,34 @@
+from conan import ConanFile
+from conan.tools.cmake import CMakeToolchain
+
+class TrantorConan(ConanFile):
+    name = "Trantor"
+    version = "0.1" # Don't care. Not publishing this
+
+    # Define the options
+    options = {
+        "tls_provider": ["openssl", "botan", 'none', '']
+    }
+
+    # Set default option
+    default_options = {
+        "tls_provider": "openssl"
+    }
+
+    # Define the dependencies
+    requires = (
+        "gtest/1.10.0",
+        # "c-ares/1.17.1",
+        "spdlog/1.12.0"
+    )
+
+    # Generator for CMake
+    generators = "CMakeToolchain"
+
+    def configure(self):
+        if self.options.tls_provider == "openssl":
+            self.requires("openssl/1.1.1t")
+        elif self.options.tls_provider == "botan":
+            self.requires("botan/3.4.0")
+        elif self.options.tls_provider == "none" or self.options.tls_provider == "":
+            pass
diff --git a/conanfile.txt b/conanfile.txt