Skip to content

[NFC][CMAKE] Fix warning on MacOS build #8166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Keenuts wants to merge 2 commits into
base: main
Choose a base branch
from
+13 −12
Open

[NFC][CMAKE] Fix warning on MacOS build #8166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
875a23b
[cmake] Change METAL_IRCONVERTER into MetalIRConverter
Keenuts Feb 18, 2026
1e73fef
fix warning about CMP0135
Keenuts Feb 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmake/config-ix.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,7 @@ string(REPLACE " " ";" LLVM_BINDINGS_LIST "${LLVM_BINDINGS}")

# HLSL Change Begin - Metal IR Converter
find_package(MetalIRConverter)
if (METAL_IRCONVERTER_FOUND)
if (MetalIRConverter_FOUND)
set(ENABLE_METAL_CODEGEN On)
message(STATUS "Enabling Metal Support")
add_definitions(-DENABLE_METAL_CODEGEN)
Expand Down
14 changes: 7 additions & 7 deletions cmake/modules/FindMetalIRConverter.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
find_path(METAL_IRCONVERTER_INCLUDE_DIR metal_irconverter.h
find_path(MetalIRConverter_INCLUDE_DIR metal_irconverter.h
HINTS /usr/local/include/metal_irconverter
DOC "Path to metal IR converter headers"
)

find_library(METAL_IRCONVERTER_LIB NAMES metalirconverter
find_library(MetalIRConverter_LIB NAMES metalirconverter
PATH_SUFFIXES lib
)

include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(METAL_IRCONVERTER
REQUIRED_VARS METAL_IRCONVERTER_LIB METAL_IRCONVERTER_INCLUDE_DIR)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(MetalIRConverter
REQUIRED_VARS MetalIRConverter_LIB MetalIRConverter_INCLUDE_DIR)

message(STATUS "Metal IR Converter Include Dir: ${METAL_IRCONVERTER_INCLUDE_DIR}")
message(STATUS "Metal IR Converter Library: ${METAL_IRCONVERTER_LIB}")
mark_as_advanced(METAL_IRCONVERTER_LIB METAL_IRCONVERTER_INCLUDE_DIR)
message(STATUS "Metal IR Converter Include Dir: ${MetalIRConverter_INCLUDE_DIR}")
message(STATUS "Metal IR Converter Library: ${MetalIRConverter_LIB}")
mark_as_advanced(MetalIRConverter_LIB MetalIRConverter_INCLUDE_DIR)
1 change: 1 addition & 0 deletions tools/clang/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ function(add_released_dxc name version)
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND ""
DOWNLOAD_EXTRACT_TIMESTAMP NEW
)
endfunction()

Expand Down
8 changes: 4 additions & 4 deletions tools/clang/tools/dxcompiler/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,12 +135,12 @@ if (ENABLE_SPIRV_CODEGEN)
target_link_libraries(dxcompiler PRIVATE clangSPIRV)
endif (ENABLE_SPIRV_CODEGEN)
if (ENABLE_METAL_CODEGEN)
target_link_libraries(dxcompiler PRIVATE ${METAL_IRCONVERTER_LIB})
target_include_directories(dxcompiler PRIVATE ${METAL_IRCONVERTER_INCLUDE_DIR})
target_link_libraries(dxcompiler PRIVATE ${MetalIRConverter_LIB})
target_include_directories(dxcompiler PRIVATE ${MetalIRConverter_INCLUDE_DIR})

get_filename_component(METAL_IRCONVERTER_LIB_DIR ${METAL_IRCONVERTER_LIB} DIRECTORY CACHE)
get_filename_component(MetalIRConverter_LIB_DIR ${MetalIRConverter_LIB} DIRECTORY CACHE)
set_property(TARGET dxcompiler APPEND_STRING
PROPERTY LINK_FLAGS " -Wl,-rpath,${METAL_IRCONVERTER_LIB_DIR}")
PROPERTY LINK_FLAGS " -Wl,-rpath,${MetalIRConverter_LIB_DIR}")
endif (ENABLE_METAL_CODEGEN)
include_directories(AFTER ${LLVM_INCLUDE_DIR}/dxc/Tracing ${DIASDK_INCLUDE_DIRS} ${HLSL_VERSION_LOCATION})
include_directories(${LLVM_SOURCE_DIR}/tools/clang/tools/dxcvalidator)
Expand Down