Skip to content

Commit 7c1a685

Browse files
committed
refactor: ggml: Improve vulkan-shaders-gen toolchain setup
Use configure_file to generate host_toolchain.cmake from template
1 parent 602295b commit 7c1a685

File tree

2 files changed

+10
-13
lines changed

2 files changed

+10
-13
lines changed

ggml/src/ggml-vulkan/CMakeLists.txt

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ function(detect_host_compiler)
1717
else()
1818
message(WARNING "Neither MSVC nor clang found")
1919
endif()
20-
elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
20+
else()
2121
find_program(CLANG_C_COMPILER clang)
2222
find_program(CLANG_CXX_COMPILER clang++)
2323
find_program(GNU_C_COMPILER gcc)
@@ -31,8 +31,6 @@ function(detect_host_compiler)
3131
else()
3232
message(WARNING "Neither clang nor gcc found")
3333
endif()
34-
else()
35-
message(WARNING "Unsupported host system: ${CMAKE_HOST_SYSTEM_NAME}")
3634
endif()
3735
endfunction()
3836

@@ -107,16 +105,7 @@ if (Vulkan_FOUND)
107105
else()
108106
message(STATUS "Host compiler: ${HOST_C_COMPILER} ${HOST_CXX_COMPILER}")
109107
endif()
110-
file(WRITE ${CMAKE_BINARY_DIR}/host_toolchain.cmake
111-
"set(CMAKE_BUILD_TYPE Release)\n"
112-
"set(CMAKE_C_FLAGS -O2)\n"
113-
"set(CMAKE_CXX_FLAGS -O2)\n"
114-
"set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)\n"
115-
"set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY NEVER)\n"
116-
"set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE NEVER)\n"
117-
"set(CMAKE_C_COMPILER ${HOST_C_COMPILER})\n"
118-
"set(CMAKE_CXX_COMPILER ${HOST_CXX_COMPILER})\n"
119-
)
108+
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/host_toolchain.cmake.in ${CMAKE_BINARY_DIR}/host_toolchain.cmake @ONLY)
120109
set(HOST_CMAKE_TOOLCHAIN_FILE ${CMAKE_BINARY_DIR}/host_toolchain.cmake)
121110
endif()
122111
message(STATUS "vulkan-shaders-gen toolchain file: ${HOST_CMAKE_TOOLCHAIN_FILE}")
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
set(CMAKE_BUILD_TYPE Release)
2+
set(CMAKE_C_FLAGS -O2)
3+
set(CMAKE_CXX_FLAGS -O2)
4+
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
5+
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY NEVER)
6+
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE NEVER)
7+
set(CMAKE_C_COMPILER @HOST_C_COMPILER@)
8+
set(CMAKE_CXX_COMPILER @HOST_CXX_COMPILER@)

0 commit comments

Comments
 (0)