Author: stefan.graenitz Date: Wed Jan 9 08:25:37 2019 New Revision: 350738
URL: http://llvm.org/viewvc/llvm-project?rev=350738&view=rev Log: [CMake] In standalone builds, LLVM_BINARY_DIR should point to LLVM's binary directory 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. Reviewers: zturner, labath, clayborg, JDevlieghere, stella.stamenova, serge-sans-paille Reviewed By: labath Subscribers: mgorny, friss, lldb-commits, #lldb Differential Revision: https://reviews.llvm.org/D56443 Modified: lldb/trunk/CMakeLists.txt lldb/trunk/cmake/modules/LLDBStandalone.cmake lldb/trunk/lit/Suite/lit.site.cfg.in lldb/trunk/lit/Unit/lit.site.cfg.py.in Modified: lldb/trunk/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/CMakeLists.txt?rev=350738&r1=350737&r2=350738&view=diff ============================================================================== --- lldb/trunk/CMakeLists.txt (original) +++ lldb/trunk/CMakeLists.txt Wed Jan 9 08:25:37 2019 @@ -110,7 +110,7 @@ if(LLDB_INCLUDE_TESTS) # 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_BINARY_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() Modified: lldb/trunk/cmake/modules/LLDBStandalone.cmake URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/cmake/modules/LLDBStandalone.cmake?rev=350738&r1=350737&r2=350738&view=diff ============================================================================== --- lldb/trunk/cmake/modules/LLDBStandalone.cmake (original) +++ lldb/trunk/cmake/modules/LLDBStandalone.cmake Wed Jan 9 08:25:37 2019 @@ -108,10 +108,8 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR 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") Modified: lldb/trunk/lit/Suite/lit.site.cfg.in URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/Suite/lit.site.cfg.in?rev=350738&r1=350737&r2=350738&view=diff ============================================================================== --- lldb/trunk/lit/Suite/lit.site.cfg.in (original) +++ lldb/trunk/lit/Suite/lit.site.cfg.in Wed Jan 9 08:25:37 2019 @@ -1,6 +1,6 @@ @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@" Modified: lldb/trunk/lit/Unit/lit.site.cfg.py.in URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/Unit/lit.site.cfg.py.in?rev=350738&r1=350737&r2=350738&view=diff ============================================================================== --- lldb/trunk/lit/Unit/lit.site.cfg.py.in (original) +++ lldb/trunk/lit/Unit/lit.site.cfg.py.in Wed Jan 9 08:25:37 2019 @@ -1,6 +1,6 @@ @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@" _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits