mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-27 19:19:01 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[botan] Fix building dynamic for non-windows systems (#39453)

Browse Source
This commit is contained in:
Matthias Kuhn 2024-06-27 06:22:32 +02:00 committed by GitHub
parent ef7c629803
commit 53c42cb317
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ports/botan/fix-cmake-usage.patch
View File

@ -1,8 +1,8 @@
diff --git a/src/build-data/botan-config.cmake.in b/src/build-data/botan-config.cmake.in
index 8d14c4e..46e2cbc 100644
index 8d14c4e..cfc9277 100644
--- a/src/build-data/botan-config.cmake.in
+++ b/src/build-data/botan-config.cmake.in
@@ -65,21 +65,29 @@ if(DEFINED ${CMAKE_FIND_PACKAGE_NAME}_FOUND AND NOT ${${CMAKE_FIND_PACKAGE_NAME}
@@ -65,27 +65,36 @@ if(DEFINED ${CMAKE_FIND_PACKAGE_NAME}_FOUND AND NOT ${${CMAKE_FIND_PACKAGE_NAME}
return()
endif()
@ -36,7 +36,16 @@ index 8d14c4e..46e2cbc 100644
endif()
%{endif}
@@ -100,10 +108,20 @@ if(NOT TARGET Botan::Botan)
%{if implib_name}
-set(_Botan_implib "${_Botan_PREFIX}/lib/%{implib_name}")
-set(_Botan_shared_lib "${_Botan_PREFIX}/bin/%{shared_lib_name}")
+set(_Botan_implib "${_Botan_PREFIX}/lib/%{implib_name}")
+set(_Botan_implib_debug "${_Botan_PREFIX}/debug/lib/%{implib_name}")
+set(_Botan_shared_lib "${_Botan_PREFIX}/bin/%{shared_lib_name}")
%{endif}
%{unless implib_name}
set(_Botan_implib "")
@@ -100,10 +109,28 @@ if(NOT TARGET Botan::Botan)
add_library(Botan::Botan SHARED IMPORTED)
set_target_properties(Botan::Botan
PROPERTIES
@ -45,18 +54,26 @@ index 8d14c4e..46e2cbc 100644
- INTERFACE_INCLUDE_DIRECTORIES "${_Botan_PREFIX}/include/botan-%{version_major}"
+ INTERFACE_INCLUDE_DIRECTORIES "${_Botan_PREFIX}/include"
INTERFACE_LINK_OPTIONS "SHELL:%{cxx_abi_flags}")
+ if(EXISTS "${_Botan_PREFIX}/debug/lib/%{implib_name}")
+ if(EXISTS "${_Botan_PREFIX}/debug/lib/%{shared_lib_name}")
+ set_property(TARGET Botan::Botan APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
+ set_target_properties(Botan::Botan PROPERTIES
+ IMPORTED_IMPLIB_DEBUG "${_Botan_PREFIX}/debug/lib/%{implib_name}"
+ IMPORTED_LOCATION_DEBUG "${_Botan_PREFIX}/debug/bin/%{shared_lib_name}"
+ )
+ if(NOT _Botan_implib STREQUAL "")
+ set_target_properties(Botan::Botan PROPERTIES
+ IMPORTED_IMPLIB_DEBUG ${_Botan_implib_debug}
+ )
+ endif()
+ endif()
+ set_property(TARGET Botan::Botan APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+ set_target_properties(Botan::Botan PROPERTIES
+ IMPORTED_IMPLIB_RELEASE "${_Botan_PREFIX}/lib/%{implib_name}"
+ IMPORTED_LOCATION_RELEASE "${_Botan_PREFIX}/bin/%{shared_lib_name}"
+ )
+ if(NOT _Botan_implib STREQUAL "")
+ set_target_properties(Botan::Botan PROPERTIES
+ IMPORTED_IMPLIB_RELEASE ${_Botan_implib}
+ )
+ endif()
set_property(TARGET Botan::Botan APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
set_target_properties(Botan::Botan
PROPERTIES

2
ports/botan/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "botan",
"version": "3.3.0",
"port-version": 1,
"port-version": 2,
"description": "A cryptography library written in C++11",
"homepage": "https://botan.randombit.net",
"license": "BSD-2-Clause",

5
versions/b-/botan.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "24b20ce86f1fff75cd0c14c71e8ddcd7459b48c8",
"version": "3.3.0",
"port-version": 2
},
{
"git-tree": "4e721d4e37cd859a5134c2cbe587aed5644bc1de",
"version": "3.3.0",

2
versions/baseline.json
View File

@ -1350,7 +1350,7 @@
},
"botan": {
"baseline": "3.3.0",
"port-version": 1
"port-version": 2
},
"box2d": {
"baseline": "2.4.1",