[Lldb-commits] [PATCH] D42990: Add CMAKE_CFG_INTDIR as part of the include path for the default test compiler.

Aaron Smith via Phabricator via lldb-commits lldb-commits at lists.llvm.org
Tue Feb 6 15:56:05 PST 2018


asmith created this revision.
asmith added reviewers: zturner, lldb-commits.
Herald added subscribers: llvm-commits, hintonda, mgorny.

This is a small change towards running the LLDB unit tests on Windows (still WIP).

Systems that use make do not point to specific configurations. However, on systems that support multiple configurations such as Windows, the configuration needs to be part of the path so the binaries produced by
clang are placed in the correct directory for the configuration.


Repository:
  rL LLVM

https://reviews.llvm.org/D42990

Files:
  CMakeLists.txt


Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -63,8 +63,8 @@
   ${LLVM_INCLUDE_TESTS})
 if(LLDB_INCLUDE_TESTS)
   if (TARGET clang)
-    set(LLDB_DEFAULT_TEST_C_COMPILER "${LLVM_BINARY_DIR}/bin/clang${CMAKE_EXECUTABLE_SUFFIX}")
-    set(LLDB_DEFAULT_TEST_CXX_COMPILER "${LLVM_BINARY_DIR}/bin/clang++${CMAKE_EXECUTABLE_SUFFIX}")
+    set(LLDB_DEFAULT_TEST_C_COMPILER "${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/clang${CMAKE_EXECUTABLE_SUFFIX}")
+    set(LLDB_DEFAULT_TEST_CXX_COMPILER "${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/clang++${CMAKE_EXECUTABLE_SUFFIX}")
   else()
     set(LLDB_DEFAULT_TEST_C_COMPILER "")
     set(LLDB_DEFAULT_TEST_CXX_COMPILER "")


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D42990.133099.patch
Type: text/x-patch
Size: 745 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20180206/3b608d6b/attachment-0001.bin>


More information about the lldb-commits mailing list