Applied botan3 crypto-backend settings for Windows native builds (2)

rnpgp · Oct 26, 2023 · ce2f0b4 · ce2f0b4
1 parent 48e102d
commit ce2f0b4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/windows-native.yml b/.github/workflows/windows-native.yml
@@ -71,13 +71,13 @@ jobs:
       matrix:
         arch: [ { name: 'x64',    triplet: 'x64-windows' } ]
         toolset: [ 'v142',  'ClangCL' ]
-        backend: [ 'botan3', 'openssl' ]
+        backend: [ 'botan', 'openssl' ]
         shared_libs: [ 'off']
         use_cmake_prefix_path: [ 'on', 'off' ]
         include:
           - arch:  { name: 'Win32',  triplet: 'x86-windows' }
             toolset:                'ClangCL'
-            backend:                'botan3'
+            backend:                'botan'
             use_cmake_prefix_path:  'on'
             shared_libs:            'off'
           - arch:  { name: 'Win32',  triplet: 'x86-windows' }

diff --git a/cmake/Modules/FindBotan.cmake b/cmake/Modules/FindBotan.cmake
@@ -65,14 +65,14 @@ find_package(PkgConfig QUIET)
 # Search for the version 2 first unless version 3 requested
 if(NOT "${Botan_FIND_VERSION_MAJOR}" EQUAL "3")
   pkg_check_modules(PC_BOTAN QUIET botan-2)
-  set(_suffixes "botan-2" "botan-3")
-  set(_names "botan-2" "libbotan-2" "botan-3" "libbotan-3")
-else()
-  set(_suffixes "botan-3")
-  set(_names "botan-3" "libbotan-3")
+  set(_suffixes "botan-2")
+  set(_names "botan-2" "libbotan-2")
 endif()
+
 if(NOT PC_BOTAN_FOUND)
   pkg_check_modules(PC_BOTAN QUIET botan-3)
+  set(_suffixes "botan-3")
+  set(_names "botan-3" "libbotan-3")
 endif()
 
 if(DEFINED BOTAN_ROOT_DIR)