From a5b911664ea86a0237cf59e9efb53bc1c33c5b8c Mon Sep 17 00:00:00 2001 From: Ted Kremenek Date: Tue, 27 Aug 2013 20:41:18 +0000 Subject: [PATCH] [CMake] Use CLANG_BINARY_DIR instead of LLVM_BINARY_DIR as installation path for Clang headers. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@189402 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Headers/CMakeLists.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt index 8be33b7b4a..219afadce9 100644 --- a/lib/Headers/CMakeLists.txt +++ b/lib/Headers/CMakeLists.txt @@ -44,13 +44,13 @@ set(files module.map ) -set(output_dir ${LLVM_BINARY_DIR}/lib/clang/${CLANG_VERSION}/include) +set(output_dir ${CLANG_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 ${LLVM_BINARY_DIR}/bin/lib/clang/${CLANG_VERSION}/include) + set(other_output_dir ${CLANG_BINARY_DIR}/bin/lib/clang/${CLANG_VERSION}/include) endif() # Generate arm_neon.h @@ -96,11 +96,11 @@ add_custom_target(clang-headers ALL DEPENDS ${out_files}) 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 "${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() + if(UNIX) + add_custom_command(TARGET clang-headers POST_BUILD + COMMAND ${CMAKE_COMMAND} -E make_directory "${CLANG_BINARY_DIR}/lib/${CMAKE_CFG_INTDIR}" + COMMAND ${CMAKE_COMMAND} -E create_symlink "${CLANG_BINARY_DIR}/bin/lib/clang" "${LLVM_BINARY_DIR}/lib/${CMAKE_CFG_INTDIR}/clang") + endif() endif () install(FILES ${files} ${output_dir}/arm_neon.h -- 2.50.1