Skip to content

fido2.cmake: Fix darwin build #388

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

fido2.cmake: Fix darwin build #388

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 1 addition & 12 deletions cmake/fido2.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,8 @@ MACRO(FIND_FIDO_VERSION)
IF(WITH_FIDO STREQUAL "bundled")
SET(FIDO_VERSION "1.7.0")
ELSE()
# This does not set any version information:
# PKG_CHECK_MODULES(SYSTEM_FIDO fido2)

MYSQL_CHECK_PKGCONFIG()
EXECUTE_PROCESS(
COMMAND ${MY_PKG_CONFIG_EXECUTABLE} --modversion libfido2
OUTPUT_VARIABLE MY_FIDO_MODVERSION
OUTPUT_STRIP_TRAILING_WHITESPACE
RESULT_VARIABLE MY_MODVERSION_RESULT
)
IF(MY_MODVERSION_RESULT EQUAL 0)
SET(FIDO_VERSION ${MY_FIDO_MODVERSION})
ENDIF()
PKG_CHECK_MODULES(FIDO libfido2)
ENDIF()
MESSAGE(STATUS "FIDO_VERSION (${WITH_FIDO}) is ${FIDO_VERSION}")
ENDMACRO(FIND_FIDO_VERSION)
Expand Down