shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[libclc] Fix libclc install on Windows when MSVC generator is used (#152703)

Browse Source 
Fix a regression of df7473673214.

cmake MSVC generator is multiple configurations. Build type is not known
at configure time and CMAKE_CFG_INTDIR is evaluated to $(Configuration)
at configure time. libclc install fails since $(Configuration) in
bitcode file path is unresolved in libclc/cmake_install.cmake at install time.

We need a solution that resolves libclc bitcode file path at install
time. This PR fixes the issue using CMAKE_INSTALL_CONFIG_NAME which can
be evaluated at install time. This is the same solution as in
https://reviews.llvm.org/D76827
This commit is contained in:
Wenju He 2025-08-11 18:05:42 +08:00 committed by GitHub
parent acb86fb9e0
commit 68c609b6c8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
libclc/cmake/modules/AddLibclc.cmake
View File

@ -199,6 +199,33 @@ function(get_libclc_device_info)
endif()
endfunction()
# Install libclc artifacts.
#
# Arguments:
# * FILES <string> ...
# List of libclc artifact files to be installed.
function(libclc_install)
cmake_parse_arguments(ARG "" "" "FILES" ${ARGN})
if( NOT ARG_FILES )
message( FATAL_ERROR "Must provide FILES" )
endif()
if( NOT CMAKE_CFG_INTDIR STREQUAL "." )
# Replace CMAKE_CFG_INTDIR with CMAKE_INSTALL_CONFIG_NAME for multiple-
# configuration generators.
string( REPLACE ${CMAKE_CFG_INTDIR} "\$\{CMAKE_INSTALL_CONFIG_NAME\}"
files ${ARG_FILES} )
else()
set( files ${ARG_FILES} )
endif()
install(
FILES ${files}
DESTINATION "${CMAKE_INSTALL_DATADIR}/clc"
)
endfunction()
# Compiles a list of library source files (provided by LIB_FILES/GEN_FILES) and
# compiles them to LLVM bytecode (or SPIR-V), links them together and optimizes
# them.
@ -425,10 +452,7 @@ function(add_libclc_builtin_set)
# targets dependent on libclc.
add_dependencies( ${ARG_PARENT_TARGET} prepare-${ARG_TRIPLE} )
install(
FILES ${libclc_builtins_lib}
DESTINATION "${CMAKE_INSTALL_DATADIR}/clc"
)
libclc_install(FILES ${libclc_builtins_lib})
# SPIR-V targets can exit early here
if( ARG_ARCH STREQUAL spirv OR ARG_ARCH STREQUAL spirv64 )
@ -470,10 +494,7 @@ function(add_libclc_builtin_set)
set_target_properties( alias-${alias_suffix}
PROPERTIES FOLDER "libclc/Device IR/Aliases"
)
install(
FILES ${LIBCLC_OUTPUT_LIBRARY_DIR}/${alias_suffix}
DESTINATION "${CMAKE_INSTALL_DATADIR}/clc"
)
libclc_install(FILES ${LIBCLC_OUTPUT_LIBRARY_DIR}/${alias_suffix})
endforeach( a )
endfunction(add_libclc_builtin_set)