From: Chris Bieneman Date: Tue, 15 Sep 2015 02:15:53 +0000 (+0000) Subject: [CMake] Rename target->dest as per feedback from Chapuni on http://reviews.llvm.org... X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5d1cac1aa28e02fda6be52b5ddf4940085df64d9;p=oota-llvm.git [CMake] Rename target->dest as per feedback from Chapuni on reviews.llvm.org/D12864 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@247658 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake index 1a314cb77ff..1e6c922169d 100644 --- a/cmake/modules/AddLLVM.cmake +++ b/cmake/modules/AddLLVM.cmake @@ -1023,28 +1023,28 @@ function(add_lit_testsuites project directory) endif() endfunction() -function(add_llvm_tool_symlink name target) +function(add_llvm_tool_symlink name dest) if(UNIX) set(LLVM_LINK_OR_COPY create_symlink) - set(target_binary "${target}${CMAKE_EXECUTABLE_SUFFIX}") + set(dest_binary "${dest}${CMAKE_EXECUTABLE_SUFFIX}") else() set(LLVM_LINK_OR_COPY copy) - set(target_binary "${LLVM_RUNTIME_OUTPUT_INTDIR}/${target}${CMAKE_EXECUTABLE_SUFFIX}") + set(dest_binary "${LLVM_RUNTIME_OUTPUT_INTDIR}/${dest}${CMAKE_EXECUTABLE_SUFFIX}") endif() set(output_path "${LLVM_RUNTIME_OUTPUT_INTDIR}/${name}${CMAKE_EXECUTABLE_SUFFIX}") add_custom_command(OUTPUT ${output_path} - COMMAND ${CMAKE_COMMAND} -E ${LLVM_LINK_OR_COPY} "${target_binary}" "${output_path}" - DEPENDS ${target}) + COMMAND ${CMAKE_COMMAND} -E ${LLVM_LINK_OR_COPY} "${dest_binary}" "${output_path}" + DEPENDS ${dest}) add_custom_target(${name} ALL DEPENDS ${output_path}) set_target_properties(${name} PROPERTIES FOLDER Tools) - # MAke sure the parent tool is a toolchain tool, otherwise exclude this tool - list(FIND LLVM_TOOLCHAIN_TOOLS ${target} LLVM_IS_${target}_TOOLCHAIN_TOOL) - if (NOT LLVM_IS_${target}_TOOLCHAIN_TOOL GREATER -1) - set(LLVM_IS_${name}_TOOLCHAIN_TOOL ${LLVM_IS_${target}_TOOLCHAIN_TOOL}) + # Make sure the parent tool is a toolchain tool, otherwise exclude this tool + list(FIND LLVM_TOOLCHAIN_TOOLS ${dest} LLVM_IS_${dest}_TOOLCHAIN_TOOL) + if (NOT LLVM_IS_${dest}_TOOLCHAIN_TOOL GREATER -1) + set(LLVM_IS_${name}_TOOLCHAIN_TOOL ${LLVM_IS_${dest}_TOOLCHAIN_TOOL}) else() list(FIND LLVM_TOOLCHAIN_TOOLS ${name} LLVM_IS_${name}_TOOLCHAIN_TOOL) endif() @@ -1054,7 +1054,7 @@ function(add_llvm_tool_symlink name target) if (LLVM_IS_${name}_TOOLCHAIN_TOOL GREATER -1 OR NOT LLVM_INSTALL_TOOLCHAIN_ONLY) if( LLVM_BUILD_TOOLS ) install(SCRIPT ${CMAKE_SOURCE_DIR}/cmake/modules/install_symlink.cmake - CODE "install_symlink(${name} ${target})" + CODE "install_symlink(${name} ${dest})" COMPONENT ${name}) if (NOT CMAKE_CONFIGURATION_TYPES)