tra updated this revision to Diff 526227.
tra added a comment.
Verified that install works correctly with
individual component installations:
cmake -DCOMPONENT=cuda-resource-headers -P ./cmake_install.cmake
cmake -DCOMPONENT=clang-resource-headers -P ./cmake_install.cmake
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D151503/new/
https://reviews.llvm.org/D151503
Files:
clang/lib/Headers/CMakeLists.txt
Index: clang/lib/Headers/CMakeLists.txt
===================================================================
--- clang/lib/Headers/CMakeLists.txt
+++ clang/lib/Headers/CMakeLists.txt
@@ -267,6 +267,9 @@
cuda_wrappers/cmath
cuda_wrappers/complex
cuda_wrappers/new
+)
+
+set(cuda_wrapper_bits_files
cuda_wrappers/bits/shared_ptr_base.h
)
@@ -328,7 +331,8 @@
# Copy header files from the source directory to the build directory
-foreach( f ${files} ${cuda_wrapper_files} ${ppc_wrapper_files}
${openmp_wrapper_files} ${hlsl_files})
+foreach( f ${files} ${cuda_wrapper_files} ${cuda_wrapper_bits_files}
+ ${ppc_wrapper_files} ${openmp_wrapper_files} ${hlsl_files})
copy_header_to_output_dir(${CMAKE_CURRENT_SOURCE_DIR} ${f})
endforeach( f )
@@ -405,6 +409,7 @@
"arm-resource-headers"
"aarch64-resource-headers"
"cuda-resource-headers"
+ "cuda-resource-bits-headers"
"hexagon-resource-headers"
"hip-resource-headers"
"hlsl-resource-headers"
@@ -429,7 +434,8 @@
# Architecture/platform specific targets
add_header_target("arm-resource-headers"
"${arm_only_files};${arm_only_generated_files}")
add_header_target("aarch64-resource-headers"
"${aarch64_only_files};${aarch64_only_generated_files}")
-add_header_target("cuda-resource-headers"
"${cuda_files};${cuda_wrapper_files}")
+add_header_target("cuda-resource-headers"
"${cuda_files};${cuda_wrapper_files};${cuda_wrapper_bits_files}")
+add_header_target("cuda-resource-bits-headers" "${cuda_wrapper_bits_files}")
add_header_target("hexagon-resource-headers" "${hexagon_files}")
add_header_target("hip-resource-headers" "${hip_files}")
add_header_target("loongarch-resource-headers" "${loongarch_files}")
@@ -463,6 +469,11 @@
DESTINATION ${header_install_dir}/cuda_wrappers
COMPONENT clang-resource-headers)
+install(
+ FILES ${cuda_wrapper_bits_files}
+ DESTINATION ${header_install_dir}/cuda_wrappers/bits
+ COMPONENT clang-resource-headers)
+
install(
FILES ${ppc_wrapper_files}
DESTINATION ${header_install_dir}/ppc_wrappers
@@ -505,6 +516,12 @@
EXCLUDE_FROM_ALL
COMPONENT cuda-resource-headers)
+install(
+ FILES ${cuda_wrapper_bits_files}
+ DESTINATION ${header_install_dir}/cuda_wrappers/bits
+ EXCLUDE_FROM_ALL
+ COMPONENT cuda-resource-headers)
+
install(
FILES ${cuda_files}
DESTINATION ${header_install_dir}
@@ -650,6 +667,9 @@
add_llvm_install_targets(install-cuda-resource-headers
DEPENDS cuda-resource-headers
COMPONENT cuda-resource-headers)
+ add_llvm_install_targets(install-cuda-resource-bits-headers
+ DEPENDS cuda-resource-bits-headers
+ COMPONENT cuda-resource-headers)
add_llvm_install_targets(install-hexagon-resource-headers
DEPENDS hexagon-resource-headers
COMPONENT hexagon-resource-headers)
Index: clang/lib/Headers/CMakeLists.txt
===================================================================
--- clang/lib/Headers/CMakeLists.txt
+++ clang/lib/Headers/CMakeLists.txt
@@ -267,6 +267,9 @@
cuda_wrappers/cmath
cuda_wrappers/complex
cuda_wrappers/new
+)
+
+set(cuda_wrapper_bits_files
cuda_wrappers/bits/shared_ptr_base.h
)
@@ -328,7 +331,8 @@
# Copy header files from the source directory to the build directory
-foreach( f ${files} ${cuda_wrapper_files} ${ppc_wrapper_files} ${openmp_wrapper_files} ${hlsl_files})
+foreach( f ${files} ${cuda_wrapper_files} ${cuda_wrapper_bits_files}
+ ${ppc_wrapper_files} ${openmp_wrapper_files} ${hlsl_files})
copy_header_to_output_dir(${CMAKE_CURRENT_SOURCE_DIR} ${f})
endforeach( f )
@@ -405,6 +409,7 @@
"arm-resource-headers"
"aarch64-resource-headers"
"cuda-resource-headers"
+ "cuda-resource-bits-headers"
"hexagon-resource-headers"
"hip-resource-headers"
"hlsl-resource-headers"
@@ -429,7 +434,8 @@
# Architecture/platform specific targets
add_header_target("arm-resource-headers" "${arm_only_files};${arm_only_generated_files}")
add_header_target("aarch64-resource-headers" "${aarch64_only_files};${aarch64_only_generated_files}")
-add_header_target("cuda-resource-headers" "${cuda_files};${cuda_wrapper_files}")
+add_header_target("cuda-resource-headers" "${cuda_files};${cuda_wrapper_files};${cuda_wrapper_bits_files}")
+add_header_target("cuda-resource-bits-headers" "${cuda_wrapper_bits_files}")
add_header_target("hexagon-resource-headers" "${hexagon_files}")
add_header_target("hip-resource-headers" "${hip_files}")
add_header_target("loongarch-resource-headers" "${loongarch_files}")
@@ -463,6 +469,11 @@
DESTINATION ${header_install_dir}/cuda_wrappers
COMPONENT clang-resource-headers)
+install(
+ FILES ${cuda_wrapper_bits_files}
+ DESTINATION ${header_install_dir}/cuda_wrappers/bits
+ COMPONENT clang-resource-headers)
+
install(
FILES ${ppc_wrapper_files}
DESTINATION ${header_install_dir}/ppc_wrappers
@@ -505,6 +516,12 @@
EXCLUDE_FROM_ALL
COMPONENT cuda-resource-headers)
+install(
+ FILES ${cuda_wrapper_bits_files}
+ DESTINATION ${header_install_dir}/cuda_wrappers/bits
+ EXCLUDE_FROM_ALL
+ COMPONENT cuda-resource-headers)
+
install(
FILES ${cuda_files}
DESTINATION ${header_install_dir}
@@ -650,6 +667,9 @@
add_llvm_install_targets(install-cuda-resource-headers
DEPENDS cuda-resource-headers
COMPONENT cuda-resource-headers)
+ add_llvm_install_targets(install-cuda-resource-bits-headers
+ DEPENDS cuda-resource-bits-headers
+ COMPONENT cuda-resource-headers)
add_llvm_install_targets(install-hexagon-resource-headers
DEPENDS hexagon-resource-headers
COMPONENT hexagon-resource-headers)
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
