early-access version 2853

This commit is contained in:
pineappleEA
2022-07-23 03:01:36 +02:00
parent 1f2b5081b5
commit 1f111bb69c
8955 changed files with 418777 additions and 999 deletions

View File

@@ -0,0 +1,47 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 11a51ac..33b9313 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -156,18 +156,20 @@ if(UNIX)
endif()
if(MSVC)
- if((NOT CBOR_INCLUDE_DIRS) OR (NOT CBOR_LIBRARY_DIRS) OR
- (NOT CBOR_BIN_DIRS) OR (NOT CRYPTO_INCLUDE_DIRS) OR
- (NOT CRYPTO_LIBRARY_DIRS) OR (NOT CRYPTO_BIN_DIRS) OR
- (NOT ZLIB_INCLUDE_DIRS) OR (NOT ZLIB_LIBRARY_DIRS) OR
- (NOT ZLIB_BIN_DIRS))
- message(FATAL_ERROR "please define "
- "{CBOR,CRYPTO,ZLIB}_{INCLUDE,LIBRARY,BIN}_DIRS when "
- "building under msvc")
- endif()
- set(CBOR_LIBRARIES cbor)
- set(ZLIB_LIBRARIES zlib)
- set(CRYPTO_LIBRARIES crypto-47)
+ find_package(PkgConfig)
+
+ find_package(LIBCBOR REQUIRED)
+ find_package(OpenSSL REQUIRED)
+ find_package(ZLIB REQUIRED)
+
+ # Handling of different Packagenames in VCPKG
+ set(CBOR_INCLUDE_DIRS ${LIBCBOR_INCLUDE_DIR})
+ set(CRYPTO_INCLUDE_DIRS ${OPENSSL_INCLUDE_DIRS})
+ set(CBOR_LIBRARY_DIRS ${LIBCBOR_LIBRARY_DIRS})
+ set(CRYPTO_LIBRARY_DIRS ${OPENSSL_LIBRARY_DIRS})
+ set(CBOR_LIBRARIES ${LIBCBOR_LIBRARIES})
+ set(CRYPTO_LIBRARIES ${OPENSSL_LIBRARIES})
+ add_definitions("-D_CRT_SECURE_NO_WARNINGS" "-D_CRT_NONSTDC_NO_DEPRECATE")
set(MSVC_DISABLED_WARNINGS_LIST
"C4152" # nonstandard extension used: function/data pointer
# conversion in expression;
@@ -403,6 +402,9 @@ message(STATUS "USE_HIDAPI: ${USE_HIDAPI}")
message(STATUS "USE_WINHELLO: ${USE_WINHELLO}")
message(STATUS "NFC_LINUX: ${NFC_LINUX}")
+set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /wd4996")
+set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /wd4996")
+
subdirs(src)
if(BUILD_EXAMPLES)
subdirs(examples)

29
externals/vcpkg/ports/libfido2/portfile.cmake vendored Executable file
View File

@@ -0,0 +1,29 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Yubico/libfido2
REF 1.10.0
SHA512 ba03e25d3f42f11cec74dee48c853ae35d03600f24ca06d2b751840408a132290fe22461372ae42ae31419061a63d9908c20a2c0cf3c0c9c8dbc46c34916784f
HEAD_REF master
PATCHES
"fix_cmakelists.patch"
)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" LIBFIDO2_BUILD_STATIC)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" LIBFIDO2_BUILD_SHARED)
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DBUILD_EXAMPLES=OFF
-DBUILD_MANPAGES=OFF
-DBUILD_STATIC_LIBS=${LIBFIDO2_BUILD_STATIC}
-DBUILD_SHARED_LIBS=${LIBFIDO2_BUILD_SHARED}
-DBUILD_TOOLS=OFF
)
vcpkg_cmake_install()
vcpkg_copy_pdbs()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY)

18
externals/vcpkg/ports/libfido2/vcpkg.json vendored Executable file
View File

@@ -0,0 +1,18 @@
{
"name": "libfido2",
"version": "1.10.0",
"port-version": 1,
"description": "Provides library functionality to communicate with a FIDO device over USB, and to verify attestation and assertion signatures.",
"homepage": "https://developers.yubico.com/libfido2/",
"license": "BSD-2-Clause",
"supports": "!uwp & (x86 | x64) & windows",
"dependencies": [
"libcbor",
"openssl",
{
"name": "vcpkg-cmake",
"host": true
},
"zlib"
]
}