From bf1ab1f0eb9578914343f48096229ecccd0ecf52 Mon Sep 17 00:00:00 2001 From: Matheus Izvekov Date: Tue, 24 May 2022 18:21:34 +0200 Subject: [PATCH] cmake: use llvm dir variables for clang/utils/hmaptool Install hmaptool using the LLVM specific variables, so everything goes in the right place in case llvm is included from a top level CMakeLists.txt. Signed-off-by: Matheus Izvekov Reviewed By: stephenneuendorffer Differential Revision: https://reviews.llvm.org/D126308 --- clang/utils/hmaptool/CMakeLists.txt | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/clang/utils/hmaptool/CMakeLists.txt b/clang/utils/hmaptool/CMakeLists.txt index f0d9866..320a24d 100644 --- a/clang/utils/hmaptool/CMakeLists.txt +++ b/clang/utils/hmaptool/CMakeLists.txt @@ -1,19 +1,9 @@ -set(CLANG_HMAPTOOL hmaptool) +add_custom_command(OUTPUT "${LLVM_TOOLS_BINARY_DIR}/hmaptool" + COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}/hmaptool" "${LLVM_TOOLS_BINARY_DIR}" + DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/hmaptool") -add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/${CLANG_HMAPTOOL} - COMMAND ${CMAKE_COMMAND} -E make_directory - ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin - COMMAND ${CMAKE_COMMAND} -E copy - ${CMAKE_CURRENT_SOURCE_DIR}/${CLANG_HMAPTOOL} - ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/ - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${CLANG_HMAPTOOL}) - -list(APPEND Depends ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/${CLANG_HMAPTOOL}) -install(PROGRAMS ${CLANG_HMAPTOOL} - DESTINATION "${CMAKE_INSTALL_BINDIR}" - COMPONENT hmaptool) - -add_custom_target(hmaptool ALL DEPENDS ${Depends}) +install(PROGRAMS hmaptool DESTINATION "${LLVM_UTILS_INSTALL_DIR}}" COMPONENT hmaptool) +add_custom_target(hmaptool ALL DEPENDS "${LLVM_TOOLS_BINARY_DIR}/hmaptool") set_target_properties(hmaptool PROPERTIES FOLDER "Utils") if(NOT LLVM_ENABLE_IDE) -- 2.7.4