Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2024-11-23 22:00:10 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

WinMsvc.cmake: try lower-case include/lib when searching for windows SDK

Browse Source 
if the pascal case ones failed. Some tools, like msvc-wine/xwin, use the
lower case.
This commit is contained in:
Yuanfang Chen 2021-12-17 16:26:08 -08:00
parent 64f4041725
commit ac313c37e1
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
llvm/cmake/platforms/WinMsvc.cmake
View File

@ -214,6 +214,14 @@ if(NOT EXISTS "${MSVC_BASE}" OR
"system headers and libraries")
endif()
# Try lowercase `include`/`lib` used by xwin/msvc-wine
if(NOT EXISTS "${WINSDK_INCLUDE}")
set(WINSDK_INCLUDE "${WINSDK_BASE}/include/${WINSDK_VER}")
endif()
if(NOT EXISTS "${WINSDK_LIB}")
set(WINSDK_LIB "${WINSDK_BASE}/lib/${WINSDK_VER}")
endif()
if(NOT EXISTS "${WINSDK_BASE}" OR
NOT EXISTS "${WINSDK_INCLUDE}" OR
NOT EXISTS "${WINSDK_LIB}")
@ -261,7 +269,7 @@ if(case_sensitive_filesystem)
init_user_prop(winsdk_vfs_overlay_path)
if(NOT winsdk_vfs_overlay_path)
set(winsdk_vfs_overlay_path "${CMAKE_BINARY_DIR}/winsdk_vfs_overlay.yaml")
generate_winsdk_vfs_overlay("${WINSDK_BASE}/Include/${WINSDK_VER}" "${winsdk_vfs_overlay_path}")
generate_winsdk_vfs_overlay("${WINSDK_INCLUDE}" "${winsdk_vfs_overlay_path}")
init_user_prop(winsdk_vfs_overlay_path)
endif()
list(APPEND COMPILE_FLAGS
@ -296,7 +304,7 @@ if(case_sensitive_filesystem)
init_user_prop(winsdk_lib_symlinks_dir)
if(NOT winsdk_lib_symlinks_dir)
set(winsdk_lib_symlinks_dir "${CMAKE_BINARY_DIR}/winsdk_lib_symlinks")
generate_winsdk_lib_symlinks("${WINSDK_BASE}/Lib/${WINSDK_VER}/um/${WINSDK_ARCH}" "${winsdk_lib_symlinks_dir}")
generate_winsdk_lib_symlinks("${WINSDK_LIB}/um/${WINSDK_ARCH}" "${winsdk_lib_symlinks_dir}")
init_user_prop(winsdk_lib_symlinks_dir)
endif()
list(APPEND LINK_FLAGS