From efe4b14e602527d049dac06dd857dd3cdbae3719 Mon Sep 17 00:00:00 2001 From: Junil Kim Date: Mon, 13 Jan 2025 13:51:15 +0900 Subject: [PATCH] refactor: Simplify CMake function for detecting host compiler Simplified the CMake function to improve the process of detecting the host compiler. --- ggml/src/ggml-vulkan/CMakeLists.txt | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/ggml/src/ggml-vulkan/CMakeLists.txt b/ggml/src/ggml-vulkan/CMakeLists.txt index 79708b916..82b90a18f 100644 --- a/ggml/src/ggml-vulkan/CMakeLists.txt +++ b/ggml/src/ggml-vulkan/CMakeLists.txt @@ -4,29 +4,15 @@ cmake_policy(SET CMP0114 NEW) find_package(Vulkan COMPONENTS glslc REQUIRED) function(detect_host_compiler) - find_program(GNU_C_COMPILER gcc NO_CMAKE_FIND_ROOT_PATH) - find_program(GNU_CXX_COMPILER g++ NO_CMAKE_FIND_ROOT_PATH) - find_program(CLANG_C_COMPILER clang NO_CMAKE_FIND_ROOT_PATH) - find_program(CLANG_CXX_COMPILER clang++ NO_CMAKE_FIND_ROOT_PATH) - if (CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") - find_program(MSVC_COMPILER cl NO_CMAKE_FIND_ROOT_PATH) - if (MSVC_COMPILER) - set(HOST_C_COMPILER "${MSVC_COMPILER}" PARENT_SCOPE) - set(HOST_CXX_COMPILER "${MSVC_COMPILER}" PARENT_SCOPE) - return() - endif() - endif() - - if (GNU_C_COMPILER AND GNU_CXX_COMPILER) - set(HOST_C_COMPILER "${GNU_C_COMPILER}" PARENT_SCOPE) - set(HOST_CXX_COMPILER "${GNU_CXX_COMPILER}" PARENT_SCOPE) - elseif (CLANG_C_COMPILER AND CLANG_CXX_COMPILER) - set(HOST_C_COMPILER "${CLANG_C_COMPILER}" PARENT_SCOPE) - set(HOST_CXX_COMPILER "${CLANG_CXX_COMPILER}" PARENT_SCOPE) + find_program(HOST_C_COMPILER NAMES cl gcc clang NO_CMAKE_FIND_ROOT_PATH) + find_program(HOST_CXX_COMPILER NAMES cl g++ clang++ NO_CMAKE_FIND_ROOT_PATH) else() - message(WARNING "No suitable host compiler found") + find_program(HOST_C_COMPILER NAMES gcc clang NO_CMAKE_FIND_ROOT_PATH) + find_program(HOST_CXX_COMPILER NAMES g++ clang++ NO_CMAKE_FIND_ROOT_PATH) endif() + set(HOST_C_COMPILER "${HOST_C_COMPILER}" PARENT_SCOPE) + set(HOST_CXX_COMPILER "${HOST_CXX_COMPILER}" PARENT_SCOPE) endfunction() if (Vulkan_FOUND)