diff options
author | Aaron Smith <aaron.smith@microsoft.com> | 2018-02-08 02:13:48 +0000 |
---|---|---|
committer | Aaron Smith <aaron.smith@microsoft.com> | 2018-02-08 02:13:48 +0000 |
commit | 35cdfe2d1d1ab8b2950254a1f7d57bc1b14183c9 (patch) | |
tree | 927bceeed1dc50a1eebcb861b248de1cc5f27d7b | |
parent | b02cebf55260ee2b0e1a50b8a5f1e0029ebffaab (diff) | |
download | bcm5719-llvm-35cdfe2d1d1ab8b2950254a1f7d57bc1b14183c9.tar.gz bcm5719-llvm-35cdfe2d1d1ab8b2950254a1f7d57bc1b14183c9.zip |
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
llvm-svn: 324555
-rw-r--r-- | lldb/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lldb/CMakeLists.txt b/lldb/CMakeLists.txt index c6b082e104e..2558033b32a 100644 --- a/lldb/CMakeLists.txt +++ b/lldb/CMakeLists.txt @@ -63,8 +63,8 @@ option(LLDB_INCLUDE_TESTS "Generate build targets for the LLDB unit tests." ${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 "") |