From 173bfbf7886608a4a7abbfac6a42ac4bf4a3432d Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Sun, 20 Sep 2020 16:14:20 +0100 Subject: New upstream version 1.5.0 --- src/CMakeLists.txt | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'src/CMakeLists.txt') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3cf62e8..ad02524 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -37,19 +37,24 @@ if(FUZZ) endif() if(USE_HIDAPI) - list(APPEND COMPAT_SOURCES hid_hidapi.c) + list(APPEND FIDO_SOURCES hid_hidapi.c) elseif(WIN32) - list(APPEND COMPAT_SOURCES hid_win.c) + list(APPEND FIDO_SOURCES hid_win.c) elseif(APPLE) - list(APPEND COMPAT_SOURCES hid_osx.c) + list(APPEND FIDO_SOURCES hid_osx.c) elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux") - list(APPEND COMPAT_SOURCES hid_linux.c) + list(APPEND FIDO_SOURCES hid_linux.c) elseif(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD") - list(APPEND COMPAT_SOURCES hid_openbsd.c) + list(APPEND FIDO_SOURCES hid_openbsd.c) else() message(FATAL_ERROR "please define a hid backend for your platform") endif() +if(NOT MSVC) + set_source_files_properties(${FIDO_SOURCES} PROPERTIES COMPILE_FLAGS + "-Wconversion -Wsign-conversion") +endif() + list(APPEND COMPAT_SOURCES ../openbsd-compat/bsd-getpagesize.c ../openbsd-compat/explicit_bzero.c @@ -94,7 +99,7 @@ elseif(APPLE) "-framework IOKit") endif() set_target_properties(fido2_shared PROPERTIES OUTPUT_NAME fido2 - VERSION ${LIB_VERSION} SOVERSION ${LIB_SOVERSION}) + VERSION ${FIDO_VERSION} SOVERSION ${FIDO_MAJOR}) install(TARGETS fido2_shared ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -- cgit v1.2.3