Author: asmith
Date: Wed Feb  7 18:13:48 2018
New Revision: 324555

URL: http://llvm.org/viewvc/llvm-project?rev=324555&view=rev
Log:
Add CMAKE_CFG_INTDIR as part of the include path for the default test compiler. 

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

Builds that use make do not point to specific configurations. However, builds 
with multiple configurations such as Visual Studio on Windows need the 
configuration (release/debug/etc) as part of the path so the binaries produced 
by clang are placed in the correct directory for the configuration.

Reviewers: zturner, lldb-commits, labath

Reviewed By: labath

Subscribers: labath, mgorny, hintonda, llvm-commits

Differential Revision: https://reviews.llvm.org/D42990

Modified:
    lldb/trunk/CMakeLists.txt

Modified: lldb/trunk/CMakeLists.txt
URL: 
http://llvm.org/viewvc/llvm-project/lldb/trunk/CMakeLists.txt?rev=324555&r1=324554&r2=324555&view=diff
==============================================================================
--- lldb/trunk/CMakeLists.txt (original)
+++ lldb/trunk/CMakeLists.txt Wed Feb  7 18:13:48 2018
@@ -63,8 +63,8 @@ option(LLDB_INCLUDE_TESTS "Generate buil
   ${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 "")


_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits

Reply via email to