Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-12-26 21:54:53 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fixed WindowsBuild with command-line (not in VisualStudio but in VSCode) to be able to compile and run tests

Browse source
This commit is contained in:
Blessio 2025-11-29 16:53:45 +01:00
parent 967dc5937f
commit f50d3f42f6
1 changed files with 22 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

23
CMakeLists.txt
View file

@ -422,6 +422,23 @@ if (MSVC)
endif()
if(WIN32)
# Additional search paths for Windows if not building/running in Visual Studio environment (e.g. commandline or VSCode)
# 1.Resolve the ambiguity of using two names for one architecture
if(CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "x64")
set(ARCH_DIR "x64")
else()
set(ARCH_DIR "${CMAKE_SYSTEM_PROCESSOR}")
endif()
# 2. 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()
set(CMAKE_RC_COMPILER_INIT windres)
enable_language(RC)
if(MINGW)
@ -443,7 +460,11 @@ if(WIN32)
endif()
endif()
# Determine if we can link against the Windows SDK, used for Windows Hello support
find_library(WINSDK WindowsApp.lib)
find_library(WINSDK WindowsApp.lib
HINTS
${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}
${WINSDKROOTC_LIB}
)
endif()
if(APPLE AND WITH_APP_BUNDLE OR WIN32)