Author: Fraser Cormack Date: 2024-09-30T10:48:30+01:00 New Revision: 9f3728d15721830ef1d29a8ae1af97124bc26b47
URL: https://github.com/llvm/llvm-project/commit/9f3728d15721830ef1d29a8ae1af97124bc26b47 DIFF: https://github.com/llvm/llvm-project/commit/9f3728d15721830ef1d29a8ae1af97124bc26b47.diff LOG: [libclc] Fix installation w/ ENABLE_RUNTIME_SUBNORMAL (#109926) The `ARCHIVE` artifact kind is not valid for `install(FILES ...)`. Additionally, install wasn't resolving the target's `TARGET_FILE` properly and was trying to find it in the top-level build directory, rather than in the libclc binary directory. This is because our `TARGET_FILE` properties were being set to relative paths. The cmake behaviour they are trying to mimic - `$<TARGET_FILE:$tgt>` - provides an absolute path. As such this patch updates instances where we set the `TARGET_FILE` property to return an absolute path. Added: Modified: libclc/CMakeLists.txt libclc/cmake/modules/AddLibclc.cmake Removed: ################################################################################ diff --git a/libclc/CMakeLists.txt b/libclc/CMakeLists.txt index 1bf7eb2ca7ed7e..260e4d433a1d49 100644 --- a/libclc/CMakeLists.txt +++ b/libclc/CMakeLists.txt @@ -221,8 +221,10 @@ if( ENABLE_RUNTIME_SUBNORMAL ) TARGET ${file} INPUTS ${CMAKE_CURRENT_SOURCE_DIR}/generic/lib/${file}.ll ) - install( FILES $<TARGET_PROPERTY:${file},TARGET_FILE> ARCHIVE - DESTINATION "${CMAKE_INSTALL_DATADIR}/clc" ) + install( + FILES $<TARGET_PROPERTY:${file},TARGET_FILE> + DESTINATION "${CMAKE_INSTALL_DATADIR}/clc" + ) endforeach() endif() @@ -426,9 +428,9 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} ) add_custom_target( ${builtins_opt_lib_tgt} ALL DEPENDS ${builtins_opt_lib_tgt}.bc ) - set_target_properties( ${builtins_opt_lib_tgt} - PROPERTIES TARGET_FILE ${builtins_opt_lib_tgt}.bc - FOLDER "libclc/Device IR/Opt" + set_target_properties( ${builtins_opt_lib_tgt} PROPERTIES + TARGET_FILE ${CMAKE_CURRENT_BINARY_DIR}/${builtins_opt_lib_tgt}.bc + FOLDER "libclc/Device IR/Opt" ) set( builtins_opt_lib $<TARGET_PROPERTY:${builtins_opt_lib_tgt},TARGET_FILE> ) diff --git a/libclc/cmake/modules/AddLibclc.cmake b/libclc/cmake/modules/AddLibclc.cmake index 839815d8cc6fff..f2032660ba99b0 100644 --- a/libclc/cmake/modules/AddLibclc.cmake +++ b/libclc/cmake/modules/AddLibclc.cmake @@ -113,7 +113,7 @@ function(link_bc) add_custom_target( ${ARG_TARGET} ALL DEPENDS ${ARG_TARGET}.bc ) set_target_properties( ${ARG_TARGET} PROPERTIES - TARGET_FILE ${ARG_TARGET}.bc + TARGET_FILE ${CMAKE_CURRENT_BINARY_DIR}/${ARG_TARGET}.bc FOLDER "libclc/Device IR/Linking" ) endfunction() _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
