File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -573,7 +573,7 @@ string(REPLACE " " ";" LLVM_BINDINGS_LIST "${LLVM_BINDINGS}")
573573
574574# HLSL Change Begin - Metal IR Converter
575575find_package (MetalIRConverter )
576- if (METAL_IRCONVERTER_FOUND )
576+ if (MetalIRConverter_FOUND )
577577 set (ENABLE_METAL_CODEGEN On )
578578 message (STATUS "Enabling Metal Support" )
579579 add_definitions (-DENABLE_METAL_CODEGEN )
Original file line number Diff line number Diff line change 1- find_path (METAL_IRCONVERTER_INCLUDE_DIR metal_irconverter.h
1+ find_path (MetalIRConverter_INCLUDE_DIR metal_irconverter.h
22 HINTS /usr/local/include/metal_irconverter
33 DOC "Path to metal IR converter headers"
44 )
55
6- find_library (METAL_IRCONVERTER_LIB NAMES metalirconverter
6+ find_library (MetalIRConverter_LIB NAMES metalirconverter
77 PATH_SUFFIXES lib
88 )
99
1010include (FindPackageHandleStandardArgs )
11- FIND_PACKAGE_HANDLE_STANDARD_ARGS (METAL_IRCONVERTER
12- REQUIRED_VARS METAL_IRCONVERTER_LIB METAL_IRCONVERTER_INCLUDE_DIR )
11+ FIND_PACKAGE_HANDLE_STANDARD_ARGS (MetalIRConverter
12+ REQUIRED_VARS MetalIRConverter_LIB MetalIRConverter_INCLUDE_DIR )
1313
14- message (STATUS "Metal IR Converter Include Dir: ${METAL_IRCONVERTER_INCLUDE_DIR } " )
15- message (STATUS "Metal IR Converter Library: ${METAL_IRCONVERTER_LIB } " )
16- mark_as_advanced (METAL_IRCONVERTER_LIB METAL_IRCONVERTER_INCLUDE_DIR )
14+ message (STATUS "Metal IR Converter Include Dir: ${MetalIRConverter_INCLUDE_DIR } " )
15+ message (STATUS "Metal IR Converter Library: ${MetalIRConverter_LIB } " )
16+ mark_as_advanced (MetalIRConverter_LIB MetalIRConverter_INCLUDE_DIR )
Original file line number Diff line number Diff line change @@ -135,6 +135,7 @@ function(add_released_dxc name version)
135135 CONFIGURE_COMMAND ""
136136 BUILD_COMMAND ""
137137 INSTALL_COMMAND ""
138+ DOWNLOAD_EXTRACT_TIMESTAMP NEW
138139 )
139140endfunction ()
140141
Original file line number Diff line number Diff line change @@ -135,12 +135,12 @@ if (ENABLE_SPIRV_CODEGEN)
135135 target_link_libraries (dxcompiler PRIVATE clangSPIRV )
136136endif (ENABLE_SPIRV_CODEGEN )
137137if (ENABLE_METAL_CODEGEN)
138- target_link_libraries (dxcompiler PRIVATE ${METAL_IRCONVERTER_LIB } )
139- target_include_directories (dxcompiler PRIVATE ${METAL_IRCONVERTER_INCLUDE_DIR } )
138+ target_link_libraries (dxcompiler PRIVATE ${MetalIRConverter_LIB } )
139+ target_include_directories (dxcompiler PRIVATE ${MetalIRConverter_INCLUDE_DIR } )
140140
141- get_filename_component (METAL_IRCONVERTER_LIB_DIR ${METAL_IRCONVERTER_LIB } DIRECTORY CACHE )
141+ get_filename_component (MetalIRConverter_LIB_DIR ${MetalIRConverter_LIB } DIRECTORY CACHE )
142142 set_property (TARGET dxcompiler APPEND_STRING
143- PROPERTY LINK_FLAGS " -Wl,-rpath,${METAL_IRCONVERTER_LIB_DIR } " )
143+ PROPERTY LINK_FLAGS " -Wl,-rpath,${MetalIRConverter_LIB_DIR } " )
144144endif (ENABLE_METAL_CODEGEN )
145145include_directories (AFTER ${LLVM_INCLUDE_DIR} /dxc/Tracing ${DIASDK_INCLUDE_DIRS} ${HLSL_VERSION_LOCATION} )
146146include_directories (${LLVM_SOURCE_DIR} /tools/clang/tools/dxcvalidator )
You can’t perform that action at this time.
0 commit comments