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 | 3fe1c88bb2bdaddacbd1792c0c42ae91382cc17e (patch) | |
| tree | a93d64b16c32979de9c2280a93b89498a336dfd7 | |
| parent | e659fff2fb7203ae949f32b5e50d030738c33f5e (diff) | |
| download | bcm5719-llvm-3fe1c88bb2bdaddacbd1792c0c42ae91382cc17e.tar.gz bcm5719-llvm-3fe1c88bb2bdaddacbd1792c0c42ae91382cc17e.zip | |
[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
llvm-svn: 375486
| -rw-r--r-- | llvm/cmake/platforms/WinMsvc.cmake | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/llvm/cmake/platforms/WinMsvc.cmake b/llvm/cmake/platforms/WinMsvc.cmake index d038df97951..6b78b069dbf 100644 --- a/llvm/cmake/platforms/WinMsvc.cmake +++ b/llvm/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}") |
