]> granicus.if.org Git - clang/commitdiff
[CMake] Fix an issue building out-of-tree introduced in r272200
authorChris Bieneman <beanz@apple.com>
Thu, 9 Jun 2016 16:21:10 +0000 (16:21 +0000)
committerChris Bieneman <beanz@apple.com>
Thu, 9 Jun 2016 16:21:10 +0000 (16:21 +0000)
The out-of-tree build needs to read LLVM_TOOLS_INSTALL_DIR out of TOOLS_BINARY_DIR because LLVM_TOOLS_INSTALL_DIR is used by AddLLVM.cmake

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@272275 91177308-0d34-0410-b5e6-96231b3b80d8

CMakeLists.txt

index fce82295508bb4f7ea0ba9bd706fbdedbc6899bc..ae955008635eed9a825dda5216e0277336b213c1 100644 (file)
@@ -56,6 +56,8 @@ if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR )
   list(GET CONFIG_OUTPUT 4 LLVM_OBJ_ROOT)
   list(GET CONFIG_OUTPUT 5 MAIN_SRC_DIR)
 
+  get_filename_component(LLVM_TOOLS_INSTALL_DIR ${TOOLS_BINARY_DIR} NAME)
+
   if(NOT MSVC_IDE)
     set(LLVM_ENABLE_ASSERTIONS ${ENABLE_ASSERTIONS}
       CACHE BOOL "Enable assertions")