[PATCH] D69240: [CMake] [WinMsvc] Look for includes and libs in ${MSVC_BASE}/atlmfc

[Martin Storsjö via Phabricator via llvm-commits]

mstorsjo created this revision.
mstorsjo added reviewers: rnk, thakis, zturner, smeenai.
Herald added a subscriber: mgorny.
Herald added a project: LLVM.

This is necessary if building with the DIA SDK enabled.

This doesn't seem to add any warnings in case the atlmfc directory doesn't exist, so hopefully it should be safe to just add it like this.


Repository:
  rL LLVM

https://reviews.llvm.org/D69240

Files:
  llvm/cmake/platforms/WinMsvc.cmake


Index: llvm/cmake/platforms/WinMsvc.cmake
===================================================================
--- llvm/cmake/platforms/WinMsvc.cmake
+++ llvm/cmake/platforms/WinMsvc.cmake
@@ -190,7 +190,9 @@
 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}")
 
@@ -247,6 +249,7 @@
     --target=${TRIPLE_ARCH}-windows-msvc
     -fms-compatibility-version=19.11
     -imsvc "${MSVC_INCLUDE}"
+    -imsvc "${ATLMFC_INCLUDE}"
     -imsvc "${WINSDK_INCLUDE}/ucrt"
     -imsvc "${WINSDK_INCLUDE}/shared"
     -imsvc "${WINSDK_INCLUDE}/um"
@@ -283,6 +286,7 @@
     /manifest:no
 
     -libpath:"${MSVC_LIB}/${WINSDK_ARCH}"
+    -libpath:"${ATLMFC_LIB}/${WINSDK_ARCH}"
     -libpath:"${WINSDK_LIB}/ucrt/${WINSDK_ARCH}"
     -libpath:"${WINSDK_LIB}/um/${WINSDK_ARCH}")
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D69240.225828.patch
Type: text/x-patch
Size: 1005 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20191021/ffaa9f70/attachment.bin>