[clang] bb46022 - [CMake] Small fix to HLSL header install paths

[Chris Bieneman via cfe-commits]

Author: Chris Bieneman
Date: 2022-10-07T09:45:11-05:00
New Revision: bb46022abe78497d3d5a8c6a6cf8599f7ec0d2ec

URL: https://github.com/llvm/llvm-project/commit/bb46022abe78497d3d5a8c6a6cf8599f7ec0d2ec
DIFF: https://github.com/llvm/llvm-project/commit/bb46022abe78497d3d5a8c6a6cf8599f7ec0d2ec.diff

LOG: [CMake] Small fix to HLSL header install paths

HLSL headers were being installed in two locations, one correct and one
incorrect, and they were always being installed (even when
CLANG_ENABLE_HLSL=Off). This corrects both issues by ensuring that the
HLSL headers aren't added to the universal header list.

Added: 
    

Modified: 
    clang/lib/Headers/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/clang/lib/Headers/CMakeLists.txt b/clang/lib/Headers/CMakeLists.txt
index 0e78238436c94..bd2161d597a8f 100644
--- a/clang/lib/Headers/CMakeLists.txt
+++ b/clang/lib/Headers/CMakeLists.txt
@@ -225,7 +225,6 @@ set(files
   ${cuda_files}
   ${hexagon_files}
   ${hip_files}
-  ${hlsl_files}
   ${mips_msa_files}
   ${opencl_files}
   ${ppc_files}
@@ -302,7 +301,7 @@ endfunction(clang_generate_header)
 
 
 # Copy header files from the source directory to the build directory
-foreach( f ${files} ${cuda_wrapper_files} ${ppc_wrapper_files} ${openmp_wrapper_files})
+foreach( f ${files} ${cuda_wrapper_files} ${ppc_wrapper_files} ${openmp_wrapper_files} ${hlsl_files})
   copy_header_to_output_dir(${CMAKE_CURRENT_SOURCE_DIR} ${f})
 endforeach( f )