Skip to content

Commit

Permalink
libfido2: add patch to install the pkgconfig files
Browse files Browse the repository at this point in the history
  • Loading branch information
nacho committed Nov 16, 2023
1 parent 8c1fa96 commit 58a33c5
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 1 deletion.
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
From dd8f6403dd58e67b3f62fa7d41f8d16ac3cdfd40 Mon Sep 17 00:00:00 2001
From: Ignacio Casal Quinteiro <[email protected]>
Date: Wed, 15 Nov 2023 11:39:36 +0100
Subject: [PATCH] Install pkgconfig files also on msvc

---
src/CMakeLists.txt | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 73493b1..4c54198 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -151,8 +151,6 @@ endif()
install(FILES fido.h DESTINATION include)
install(DIRECTORY fido DESTINATION include)

-if(NOT MSVC)
- configure_file(libfido2.pc.in libfido2.pc @ONLY)
- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libfido2.pc"
- DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
-endif()
+configure_file(libfido2.pc.in libfido2.pc @ONLY)
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libfido2.pc"
+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
--
2.34.1

5 changes: 4 additions & 1 deletion gvsbuild/projects/libfido2.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,10 @@ def __init__(self):
"openssl",
"libcbor",
],
patches=["0001-libfido2-update-cmake-script-to-have-sdl-flag-before.patch"],
patches=[
"0001-libfido2-update-cmake-script-to-have-sdl-flag-before.patch",
"0001-Install-pkgconfig-files-also-on-msvc.patch",
],
)

def build(self):
Expand Down

0 comments on commit 58a33c5

Please sign in to comment.