mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-04-01 19:47:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

Add alternative path finding for PCSC headers/libraries

Browse source 
* When running the build outside of a visual studio environment, PCSC libraries may not be discoverable. This change explicitly adds Windows SDK's to the search path.
This commit is contained in:
Blessio 2024-10-01 00:22:21 +02:00 • committed by Jonathan White
parent 29ac4da240
commit f3b08102c4
1 changed files with 25 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

28
cmake/FindPCSC.cmake
View file

@ -21,16 +21,38 @@ endif()
if(NOT PCSC_FOUND) if(NOT PCSC_FOUND)
# Search for PC/SC headers on Mac and Windows # Search for PC/SC headers on Mac and Windows
# Additional search paths for Windows if not running in Visual Studio environment
if (WIN32)
# Resolve the ambiguity of using two names for one architechture
if(CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "x64")
set(ARCH_DIR "x64")
else()
set(ARCH_DIR "${CMAKE_SYSTEM_PROCESSOR}")
endif()
# Locate Windows SDK Paths
if (CMAKE_WINDOWS_KITS_10_DIR)
set(WINSDKROOTC_INCLUDE "${CMAKE_WINDOWS_KITS_10_DIR}/Include/${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}/um")
set(WINSDKROOTC_LIB "${CMAKE_WINDOWS_KITS_10_DIR}/LIB/${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}/um/${ARCH_DIR}")
else()
set(WINSDKROOTC_INCLUDE "$ENV{ProgramFiles\(x86\)}/Windows Kits/10/Include/${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}/um")
set(WINSDKROOTC_LIB "$ENV{ProgramFiles\(x86\)}/Windows Kits/10/LIB/${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}/um/${ARCH_DIR}")
endif()
endif()
find_path(PCSC_INCLUDE_DIRS winscard.h find_path(PCSC_INCLUDE_DIRS winscard.h
HINTS HINTS
${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES} ${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}
/usr/include/PCSC /usr/include/PCSC
${WINSDKROOTC_INCLUDE}
PATH_SUFFIXES PCSC) PATH_SUFFIXES PCSC)
# MAC library is PCSC, Windows library is WinSCard # MAC library is PCSC, Windows library is WinSCard
find_library(PCSC_LIBRARIES NAMES pcsclite libpcsclite WinSCard PCSC find_library(PCSC_LIBRARIES NAMES pcsclite libpcsclite WinSCard PCSC
HINTS HINTS
${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}
${WINSDKROOTC_LIB})
endif() endif()
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)