[CMake] In standalone builds, LLVM_BINARY_DIR should point to LLVM's binary directory

[sgraenitz]

Summary

In standalone builds LLVM_BINARY_DIR was equal to LLDB_BINARY_DIR so far. This is counterintuitive and invalidated the values of LLDB_DEFAULT_TEST_DSYMUTIL/FILECHECK/COMPILER etc.

[sgraenitz]

Use LLVM_BINARY_DIR when checking for existance of libc++ include directory

[labath]

Makes sense to me.

CMakeLists.txt

117

typo (but BINRAY sounds cool, we should make that mean something :P).

[sgraenitz]

Fix typo

[sgraenitz]

CMakeLists.txt

117

Woooow thanks!

CMakeLists.txt

if(LLDB_INCLUDE_TESTS)
   # This works with standalone builds as they import the clang target.
   if(TARGET clang)
     list(APPEND LLDB_TEST_DEPS clang)
     if(APPLE)
       # If we build clang, we should build libcxx.
       # FIXME: Standalone builds should import the cxx target as well.
       if(LLDB_BUILT_STANDALONE)
         # For now check that the include directory exists.
-        set(cxx_dir "${LLVM_DIR}/../../../include/c++")
+        set(cxx_dir "${LLVM_BINRAY_DIR}/include/c++")
         if(NOT EXISTS ${cxx_dir})
           message(WARNING "LLDB test suite requires libc++ in llvm/projects/libcxx or an existing build symlinked to ${cxx_dir}")
         endif()
       else()
         list(APPEND LLDB_TEST_DEPS cxx)
       endif()
     endif()
   endif()

cmake/modules/LLDBStandalone.cmake

if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
   include("${LLVM_OBJ_ROOT}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm/LLVMConfig.cmake")
   # cmake/clang/ClangConfig.cmake is not created when LLVM and Clang are built together.
   if (EXISTS "${LLVM_OBJ_ROOT}/lib${LLVM_LIBDIR_SUFFIX}/cmake/clang/ClangConfig.cmake")
     include("${LLVM_OBJ_ROOT}/lib${LLVM_LIBDIR_SUFFIX}/cmake/clang/ClangConfig.cmake")
   endif()
 
   set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}")
 
-  set(LLVM_BINARY_DIR ${CMAKE_BINARY_DIR})
-
   set(CMAKE_INCLUDE_CURRENT_DIR ON)
-  include_directories("${LLVM_BINARY_DIR}/include" "${LLVM_MAIN_INCLUDE_DIR}")
+  include_directories("${CMAKE_BINARY_DIR}/include" "${LLVM_MAIN_INCLUDE_DIR}")
   # Next three include directories are needed when llvm-config is located in build directory.
   # LLVM and Clang are assumed to be built together
   if (EXISTS "${LLVM_OBJ_ROOT}/include")
     include_directories("${LLVM_OBJ_ROOT}/include")
   endif()
   if (EXISTS "${LLVM_MAIN_SRC_DIR}/tools/clang/include")
     include_directories("${LLVM_MAIN_SRC_DIR}/tools/clang/include")
   endif()

lit/Suite/lit.site.cfg.in

 @LIT_SITE_CFG_IN_HEADER@
 
-config.test_exec_root = "@LLVM_BINARY_DIR@"
+config.test_exec_root = "@LLDB_BINARY_DIR@"
 config.llvm_src_root = "@LLVM_SOURCE_DIR@"
 config.llvm_obj_root = "@LLVM_BINARY_DIR@"
 config.llvm_tools_dir = "@LLVM_TOOLS_DIR@"
 config.llvm_libs_dir = "@LLVM_LIBS_DIR@"
 config.llvm_build_mode = "@LLVM_BUILD_MODE@"
 config.lit_tools_dir = "@LLVM_LIT_TOOLS_DIR@"
 config.lldb_obj_root = "@LLDB_BINARY_DIR@"
 config.lldb_src_root = "@LLDB_SOURCE_DIR@"

lit/Unit/lit.site.cfg.py.in

 @LIT_SITE_CFG_IN_HEADER@
 
-config.test_exec_root = "@LLVM_BINARY_DIR@" 
+config.test_exec_root = "@LLDB_BINARY_DIR@"
 config.llvm_src_root = "@LLVM_SOURCE_DIR@"
 config.llvm_obj_root = "@LLVM_BINARY_DIR@"
 config.llvm_tools_dir = "@LLVM_TOOLS_DIR@"
 config.llvm_libs_dir = "@LLVM_LIBS_DIR@"
 config.llvm_build_mode = "@LLVM_BUILD_MODE@"
 config.lit_tools_dir = "@LLVM_LIT_TOOLS_DIR@"
 config.lldb_obj_root = "@LLDB_BINARY_DIR@"
 config.lldb_src_root = "@LLDB_SOURCE_DIR@"