vcpkg/ports/libfido2/fix_cmakelists.patch

57 lines
1.9 KiB
Diff
Raw Normal View History

[libfido2] New port (#16965) * [libfido2] New port * [libfido2] Update versions * [libfido2] Fixed invalid dll rename in static library versions * [libfido2] Update versions * [libfido2] Exclude UWP from supported platforms * [libfido2] Update versions * [libfido2] Bump version to new upstream 1.7 release * [libfido2] Update versions * Fix indenting Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [libfido2] Implement multiple issues/suggestions from PR * [libfido2] Update versions * [libfido2] Removed surplus option from vcpkg_from_github * [libfido2] Update versions * [libfido2] Apply suggested changes to use the new vcpkg-cmake port * [libfido2] Update versions * [libfido2] Reapply formatting * [libfido2] Update versions * [libfido2] Changed dependency entry for vcpkg-cmake * [libfido2] Update versions * [libfido2] New port * [libfido2] Update versions * [libfido2] Fixed invalid dll rename in static library versions * [libfido2] Update versions * [libfido2] Exclude UWP from supported platforms * [libfido2] Update versions * [libfido2] Bump version to new upstream 1.7 release * [libfido2] Update versions * Fix indenting Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [libfido2] Implement multiple issues/suggestions from PR * [libfido2] Update versions * [libfido2] Removed surplus option from vcpkg_from_github * [libfido2] Update versions * [libfido2] Apply suggested changes to use the new vcpkg-cmake port * [libfido2] Update versions * [libfido2] Reapply formatting * [libfido2] Update versions * [libfido2] Changed dependency entry for vcpkg-cmake * [libfido2] Update versions Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2021-05-07 08:41:20 +08:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
2023-03-16 01:31:12 +08:00
index 6fa341a..8124d80 100644
[libfido2] New port (#16965) * [libfido2] New port * [libfido2] Update versions * [libfido2] Fixed invalid dll rename in static library versions * [libfido2] Update versions * [libfido2] Exclude UWP from supported platforms * [libfido2] Update versions * [libfido2] Bump version to new upstream 1.7 release * [libfido2] Update versions * Fix indenting Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [libfido2] Implement multiple issues/suggestions from PR * [libfido2] Update versions * [libfido2] Removed surplus option from vcpkg_from_github * [libfido2] Update versions * [libfido2] Apply suggested changes to use the new vcpkg-cmake port * [libfido2] Update versions * [libfido2] Reapply formatting * [libfido2] Update versions * [libfido2] Changed dependency entry for vcpkg-cmake * [libfido2] Update versions * [libfido2] New port * [libfido2] Update versions * [libfido2] Fixed invalid dll rename in static library versions * [libfido2] Update versions * [libfido2] Exclude UWP from supported platforms * [libfido2] Update versions * [libfido2] Bump version to new upstream 1.7 release * [libfido2] Update versions * Fix indenting Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [libfido2] Implement multiple issues/suggestions from PR * [libfido2] Update versions * [libfido2] Removed surplus option from vcpkg_from_github * [libfido2] Update versions * [libfido2] Apply suggested changes to use the new vcpkg-cmake port * [libfido2] Update versions * [libfido2] Reapply formatting * [libfido2] Update versions * [libfido2] Changed dependency entry for vcpkg-cmake * [libfido2] Update versions Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2021-05-07 08:41:20 +08:00
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
2023-03-16 01:31:12 +08:00
@@ -169,27 +169,20 @@ endif()
[libfido2] New port (#16965) * [libfido2] New port * [libfido2] Update versions * [libfido2] Fixed invalid dll rename in static library versions * [libfido2] Update versions * [libfido2] Exclude UWP from supported platforms * [libfido2] Update versions * [libfido2] Bump version to new upstream 1.7 release * [libfido2] Update versions * Fix indenting Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [libfido2] Implement multiple issues/suggestions from PR * [libfido2] Update versions * [libfido2] Removed surplus option from vcpkg_from_github * [libfido2] Update versions * [libfido2] Apply suggested changes to use the new vcpkg-cmake port * [libfido2] Update versions * [libfido2] Reapply formatting * [libfido2] Update versions * [libfido2] Changed dependency entry for vcpkg-cmake * [libfido2] Update versions * [libfido2] New port * [libfido2] Update versions * [libfido2] Fixed invalid dll rename in static library versions * [libfido2] Update versions * [libfido2] Exclude UWP from supported platforms * [libfido2] Update versions * [libfido2] Bump version to new upstream 1.7 release * [libfido2] Update versions * Fix indenting Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [libfido2] Implement multiple issues/suggestions from PR * [libfido2] Update versions * [libfido2] Removed surplus option from vcpkg_from_github * [libfido2] Update versions * [libfido2] Apply suggested changes to use the new vcpkg-cmake port * [libfido2] Update versions * [libfido2] Reapply formatting * [libfido2] Update versions * [libfido2] Changed dependency entry for vcpkg-cmake * [libfido2] Update versions Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2021-05-07 08:41:20 +08:00
if(MSVC)
- if((NOT CBOR_INCLUDE_DIRS) OR (NOT CBOR_LIBRARY_DIRS) OR
2023-03-16 01:31:12 +08:00
- (NOT CRYPTO_INCLUDE_DIRS) OR (NOT CRYPTO_LIBRARY_DIRS) OR
- (NOT ZLIB_INCLUDE_DIRS) OR (NOT ZLIB_LIBRARY_DIRS))
- message(FATAL_ERROR "please define "
2023-03-16 01:31:12 +08:00
- "{CBOR,CRYPTO,ZLIB}_{INCLUDE,LIBRARY}_DIRS when "
- "building under msvc")
[libfido2] New port (#16965) * [libfido2] New port * [libfido2] Update versions * [libfido2] Fixed invalid dll rename in static library versions * [libfido2] Update versions * [libfido2] Exclude UWP from supported platforms * [libfido2] Update versions * [libfido2] Bump version to new upstream 1.7 release * [libfido2] Update versions * Fix indenting Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [libfido2] Implement multiple issues/suggestions from PR * [libfido2] Update versions * [libfido2] Removed surplus option from vcpkg_from_github * [libfido2] Update versions * [libfido2] Apply suggested changes to use the new vcpkg-cmake port * [libfido2] Update versions * [libfido2] Reapply formatting * [libfido2] Update versions * [libfido2] Changed dependency entry for vcpkg-cmake * [libfido2] Update versions * [libfido2] New port * [libfido2] Update versions * [libfido2] Fixed invalid dll rename in static library versions * [libfido2] Update versions * [libfido2] Exclude UWP from supported platforms * [libfido2] Update versions * [libfido2] Bump version to new upstream 1.7 release * [libfido2] Update versions * Fix indenting Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [libfido2] Implement multiple issues/suggestions from PR * [libfido2] Update versions * [libfido2] Removed surplus option from vcpkg_from_github * [libfido2] Update versions * [libfido2] Apply suggested changes to use the new vcpkg-cmake port * [libfido2] Update versions * [libfido2] Reapply formatting * [libfido2] Update versions * [libfido2] Changed dependency entry for vcpkg-cmake * [libfido2] Update versions Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2021-05-07 08:41:20 +08:00
- endif()
2023-03-16 01:31:12 +08:00
- if(BUILD_TESTS AND BUILD_SHARED_LIBS AND
- ((NOT CBOR_BIN_DIRS) OR (NOT ZLIB_BIN_DIRS) OR (NOT CRYPTO_BIN_DIRS)))
- message(FATAL_ERROR "please define {CBOR,CRYPTO,ZLIB}_BIN_DIRS "
- "when building tests")
- endif()
- if(NOT CBOR_LIBRARIES)
- set(CBOR_LIBRARIES cbor)
- endif()
- if(NOT ZLIB_LIBRARIES)
- set(ZLIB_LIBRARIES zlib1)
- endif()
- if(NOT CRYPTO_LIBRARIES)
- set(CRYPTO_LIBRARIES crypto)
- endif()
+ find_package(PkgConfig)
+
[libfido2] New port (#16965) * [libfido2] New port * [libfido2] Update versions * [libfido2] Fixed invalid dll rename in static library versions * [libfido2] Update versions * [libfido2] Exclude UWP from supported platforms * [libfido2] Update versions * [libfido2] Bump version to new upstream 1.7 release * [libfido2] Update versions * Fix indenting Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [libfido2] Implement multiple issues/suggestions from PR * [libfido2] Update versions * [libfido2] Removed surplus option from vcpkg_from_github * [libfido2] Update versions * [libfido2] Apply suggested changes to use the new vcpkg-cmake port * [libfido2] Update versions * [libfido2] Reapply formatting * [libfido2] Update versions * [libfido2] Changed dependency entry for vcpkg-cmake * [libfido2] Update versions * [libfido2] New port * [libfido2] Update versions * [libfido2] Fixed invalid dll rename in static library versions * [libfido2] Update versions * [libfido2] Exclude UWP from supported platforms * [libfido2] Update versions * [libfido2] Bump version to new upstream 1.7 release * [libfido2] Update versions * Fix indenting Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [libfido2] Implement multiple issues/suggestions from PR * [libfido2] Update versions * [libfido2] Removed surplus option from vcpkg_from_github * [libfido2] Update versions * [libfido2] Apply suggested changes to use the new vcpkg-cmake port * [libfido2] Update versions * [libfido2] Reapply formatting * [libfido2] Update versions * [libfido2] Changed dependency entry for vcpkg-cmake * [libfido2] Update versions Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2021-05-07 08:41:20 +08:00
+ find_package(LIBCBOR REQUIRED)
+ find_package(OpenSSL REQUIRED)
+ find_package(ZLIB REQUIRED)
+
[libfido2] New port (#16965) * [libfido2] New port * [libfido2] Update versions * [libfido2] Fixed invalid dll rename in static library versions * [libfido2] Update versions * [libfido2] Exclude UWP from supported platforms * [libfido2] Update versions * [libfido2] Bump version to new upstream 1.7 release * [libfido2] Update versions * Fix indenting Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [libfido2] Implement multiple issues/suggestions from PR * [libfido2] Update versions * [libfido2] Removed surplus option from vcpkg_from_github * [libfido2] Update versions * [libfido2] Apply suggested changes to use the new vcpkg-cmake port * [libfido2] Update versions * [libfido2] Reapply formatting * [libfido2] Update versions * [libfido2] Changed dependency entry for vcpkg-cmake * [libfido2] Update versions * [libfido2] New port * [libfido2] Update versions * [libfido2] Fixed invalid dll rename in static library versions * [libfido2] Update versions * [libfido2] Exclude UWP from supported platforms * [libfido2] Update versions * [libfido2] Bump version to new upstream 1.7 release * [libfido2] Update versions * Fix indenting Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [libfido2] Implement multiple issues/suggestions from PR * [libfido2] Update versions * [libfido2] Removed surplus option from vcpkg_from_github * [libfido2] Update versions * [libfido2] Apply suggested changes to use the new vcpkg-cmake port * [libfido2] Update versions * [libfido2] Reapply formatting * [libfido2] Update versions * [libfido2] Changed dependency entry for vcpkg-cmake * [libfido2] Update versions Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2021-05-07 08:41:20 +08:00
+ # 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")
2023-03-16 01:31:12 +08:00
[libfido2] New port (#16965) * [libfido2] New port * [libfido2] Update versions * [libfido2] Fixed invalid dll rename in static library versions * [libfido2] Update versions * [libfido2] Exclude UWP from supported platforms * [libfido2] Update versions * [libfido2] Bump version to new upstream 1.7 release * [libfido2] Update versions * Fix indenting Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [libfido2] Implement multiple issues/suggestions from PR * [libfido2] Update versions * [libfido2] Removed surplus option from vcpkg_from_github * [libfido2] Update versions * [libfido2] Apply suggested changes to use the new vcpkg-cmake port * [libfido2] Update versions * [libfido2] Reapply formatting * [libfido2] Update versions * [libfido2] Changed dependency entry for vcpkg-cmake * [libfido2] Update versions * [libfido2] New port * [libfido2] Update versions * [libfido2] Fixed invalid dll rename in static library versions * [libfido2] Update versions * [libfido2] Exclude UWP from supported platforms * [libfido2] Update versions * [libfido2] Bump version to new upstream 1.7 release * [libfido2] Update versions * Fix indenting Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [libfido2] Implement multiple issues/suggestions from PR * [libfido2] Update versions * [libfido2] Removed surplus option from vcpkg_from_github * [libfido2] Update versions * [libfido2] Apply suggested changes to use the new vcpkg-cmake port * [libfido2] Update versions * [libfido2] Reapply formatting * [libfido2] Update versions * [libfido2] Changed dependency entry for vcpkg-cmake * [libfido2] Update versions Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2021-05-07 08:41:20 +08:00
set(MSVC_DISABLED_WARNINGS_LIST
"C4152" # nonstandard extension used: function/data pointer
2023-03-16 01:31:12 +08:00
@@ -469,6 +462,9 @@ message(STATUS "USE_PCSC: ${USE_PCSC}")
message(STATUS "USE_WINHELLO: ${USE_WINHELLO}")
message(STATUS "NFC_LINUX: ${NFC_LINUX}")
[libfido2] New port (#16965) * [libfido2] New port * [libfido2] Update versions * [libfido2] Fixed invalid dll rename in static library versions * [libfido2] Update versions * [libfido2] Exclude UWP from supported platforms * [libfido2] Update versions * [libfido2] Bump version to new upstream 1.7 release * [libfido2] Update versions * Fix indenting Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [libfido2] Implement multiple issues/suggestions from PR * [libfido2] Update versions * [libfido2] Removed surplus option from vcpkg_from_github * [libfido2] Update versions * [libfido2] Apply suggested changes to use the new vcpkg-cmake port * [libfido2] Update versions * [libfido2] Reapply formatting * [libfido2] Update versions * [libfido2] Changed dependency entry for vcpkg-cmake * [libfido2] Update versions * [libfido2] New port * [libfido2] Update versions * [libfido2] Fixed invalid dll rename in static library versions * [libfido2] Update versions * [libfido2] Exclude UWP from supported platforms * [libfido2] Update versions * [libfido2] Bump version to new upstream 1.7 release * [libfido2] Update versions * Fix indenting Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [libfido2] Implement multiple issues/suggestions from PR * [libfido2] Update versions * [libfido2] Removed surplus option from vcpkg_from_github * [libfido2] Update versions * [libfido2] Apply suggested changes to use the new vcpkg-cmake port * [libfido2] Update versions * [libfido2] Reapply formatting * [libfido2] Update versions * [libfido2] Changed dependency entry for vcpkg-cmake * [libfido2] Update versions Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2021-05-07 08:41:20 +08:00
+set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /wd4996")
+set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /wd4996")
+
2023-03-16 01:31:12 +08:00
if(BUILD_TESTS)
enable_testing()
endif()