diff options
| author | Martin Storsjo <martin@martin.st> | 2019-10-22 06:36:27 +0000 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2019-10-22 06:36:27 +0000 |
| commit | d35e5f8dded4c884ca25ca88f184e1505cad106c (patch) | |
| tree | 702181bf47f3089f5eb70edac89797e5fc3e1000 | |
| parent | 5205202f41907377b35223fef500f2d5679995c4 (diff) | |
| download | llvm-d35e5f8dded4c884ca25ca88f184e1505cad106c.tar.gz | |
[CMake] [WinMsvc] Look for includes and libs in ${MSVC_BASE}/atlmfc
This is necessary if building with the DIA SDK enabled.
Differential Revision: https://reviews.llvm.org/D69240
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@375486 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | cmake/platforms/WinMsvc.cmake | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cmake/platforms/WinMsvc.cmake b/cmake/platforms/WinMsvc.cmake index d038df97951..6b78b069dbf 100644 --- a/cmake/platforms/WinMsvc.cmake +++ b/cmake/platforms/WinMsvc.cmake @@ -190,7 +190,9 @@ else() endif() set(MSVC_INCLUDE "${MSVC_BASE}/include") +set(ATLMFC_INCLUDE "${MSVC_BASE}/atlmfc/include") set(MSVC_LIB "${MSVC_BASE}/lib") +set(ATLMFC_LIB "${MSVC_BASE}/atlmfc/lib") set(WINSDK_INCLUDE "${WINSDK_BASE}/Include/${WINSDK_VER}") set(WINSDK_LIB "${WINSDK_BASE}/Lib/${WINSDK_VER}") @@ -246,6 +248,7 @@ set(COMPILE_FLAGS -D_CRT_SECURE_NO_WARNINGS --target=${TRIPLE_ARCH}-windows-msvc -fms-compatibility-version=19.11 + -imsvc "${ATLMFC_INCLUDE}" -imsvc "${MSVC_INCLUDE}" -imsvc "${WINSDK_INCLUDE}/ucrt" -imsvc "${WINSDK_INCLUDE}/shared" @@ -282,6 +285,7 @@ set(LINK_FLAGS # Prevent CMake from attempting to invoke mt.exe. It only recognizes the slashed form and not the dashed form. /manifest:no + -libpath:"${ATLMFC_LIB}/${WINSDK_ARCH}" -libpath:"${MSVC_LIB}/${WINSDK_ARCH}" -libpath:"${WINSDK_LIB}/ucrt/${WINSDK_ARCH}" -libpath:"${WINSDK_LIB}/um/${WINSDK_ARCH}") |