r323368 - Revert r323051 "[cmake] Use CLANG_BINARY_DIR to determine the build directory."

Vassil Vassilev via cfe-commits cfe-commits at lists.llvm.org
Wed Jan 24 11:26:50 PST 2018


Author: vvassilev
Date: Wed Jan 24 11:26:50 2018
New Revision: 323368

URL: http://llvm.org/viewvc/llvm-project?rev=323368&view=rev
Log:
Revert r323051 "[cmake] Use CLANG_BINARY_DIR to determine the build directory."

This broke swift builds.

Thanks for the post-commit review of Chris Bieneman and Davide Italiano!

Modified:
    cfe/trunk/cmake/modules/CMakeLists.txt

Modified: cfe/trunk/cmake/modules/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/cmake/modules/CMakeLists.txt?rev=323368&r1=323367&r2=323368&view=diff
==============================================================================
--- cfe/trunk/cmake/modules/CMakeLists.txt (original)
+++ cfe/trunk/cmake/modules/CMakeLists.txt Wed Jan 24 11:26:50 2018
@@ -2,7 +2,7 @@
 # link against them. LLVM calls its version of this file LLVMExports.cmake, but
 # the usual CMake convention seems to be ${Project}Targets.cmake.
 set(CLANG_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/clang)
-set(clang_cmake_builddir "${CLANG_BINARY_DIR}/${CLANG_INSTALL_PACKAGE_DIR}")
+set(clang_cmake_builddir "${CMAKE_BINARY_DIR}/${CLANG_INSTALL_PACKAGE_DIR}")
 
 # Keep this in sync with llvm/cmake/CMakeLists.txt!
 set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm)




More information about the cfe-commits mailing list