From 2894000b484a62dc174d6f0773dd918b203c27a1 Mon Sep 17 00:00:00 2001 From: Ted Kremenek Date: Wed, 28 Aug 2013 00:07:08 +0000 Subject: Revert "Use CMAKE_RUNTIME_OUTPUT_DIRECTORY instead of LLVM_BINARY_DIR for installing Clang headers." This appears to be breaking the buildbots. llvm-svn: 189426 --- clang/lib/Headers/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'clang/lib/Headers') diff --git a/clang/lib/Headers/CMakeLists.txt b/clang/lib/Headers/CMakeLists.txt index 0570990d664..8be33b7b4a1 100644 --- a/clang/lib/Headers/CMakeLists.txt +++ b/clang/lib/Headers/CMakeLists.txt @@ -44,13 +44,13 @@ set(files module.map ) -set(output_dir ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/lib/clang/${CLANG_VERSION}/include) +set(output_dir ${LLVM_BINARY_DIR}/lib/clang/${CLANG_VERSION}/include) # If we are in an IDE that has a configuration directory, we need to # create a second copy of the headers so that 'clang' can find them if # it's run from the build directory. if(MSVC_IDE OR XCODE) - set(other_output_dir ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/bin/lib/clang/${CLANG_VERSION}/include) + set(other_output_dir ${LLVM_BINARY_DIR}/bin/lib/clang/${CLANG_VERSION}/include) endif() # Generate arm_neon.h @@ -98,8 +98,8 @@ set_target_properties(clang-headers PROPERTIES FOLDER "Misc") if (other_output_dir) if(UNIX) add_custom_command(TARGET clang-headers POST_BUILD - COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/lib/${CMAKE_CFG_INTDIR}" - COMMAND ${CMAKE_COMMAND} -E create_symlink "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/bin/lib/clang" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/lib/${CMAKE_CFG_INTDIR}/clang") + COMMAND ${CMAKE_COMMAND} -E make_directory "${LLVM_BINARY_DIR}/lib/${CMAKE_CFG_INTDIR}" + COMMAND ${CMAKE_COMMAND} -E create_symlink "${LLVM_BINARY_DIR}/bin/lib/clang" "${LLVM_BINARY_DIR}/lib/${CMAKE_CFG_INTDIR}/clang") endif() endif () -- cgit v1.2.3