summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Gottesman <mgottesman@apple.com>2016-06-29 21:12:38 +0000
committerMichael Gottesman <mgottesman@apple.com>2016-06-29 21:12:38 +0000
commit21ae2c7c2e7179fa49c06843d22a8392845f3983 (patch)
treebffa832a14422d9078e2dc71e4e9c292c27fa030
parent9e03e89d5d8863acc1f3b33e4d1fa433864ba2c6 (diff)
[ClangConfig] Copy ClangConfig.cmake to ${CMAKE_BINARY_DIR}/${CLANG_INSTALL_PACKAGE_DIR} instead of to ${CLANG_BINARY_DIR}/${CLANG_INSTALL_PACKAGE_DIR}.
This is an obvious bug since ClangConfig.cmake looks for ClangTargets.cmake in ${CMAKE_CURRENT_LIST_DIR}. But ClangTargets.cmake is in ${CMAKE_BINARY_DIR}/${CLANG_INSTALL_PACKAGE_DIR}, so it will always fail with an in tree build. In the case where clang is built out of tree, this is still correct since CMAKE_BINARY_DIR and CLANG_BINARY_DIR will be the same. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@274168 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--cmake/modules/CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt
index 8eb84cd1ad..f0af3e9da7 100644
--- a/cmake/modules/CMakeLists.txt
+++ b/cmake/modules/CMakeLists.txt
@@ -18,5 +18,5 @@ install(FILES
# can build against a build directory of Clang more easily.
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/ClangConfig.cmake
- ${CLANG_BINARY_DIR}/${CLANG_INSTALL_PACKAGE_DIR}/ClangConfig.cmake
+ ${clang_cmake_builddir}/ClangConfig.cmake
COPYONLY)