From ceb58f0ccf6f5bbee531566fbaaa955f1d9de429 Mon Sep 17 00:00:00 2001 From: Pavel Liavonau Date: Thu, 11 Jul 2024 02:57:17 +0200 Subject: IntelLLVM: Update toolchain layout for 2024+ versions HPC Intel changed layout of llvm related binary files from `bin/../bin-llvm` to `bin/compiler`. --- Modules/Compiler/IntelLLVM-FindBinUtils.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Modules/Compiler/IntelLLVM-FindBinUtils.cmake b/Modules/Compiler/IntelLLVM-FindBinUtils.cmake index c5b1ee6..a4445f7 100644 --- a/Modules/Compiler/IntelLLVM-FindBinUtils.cmake +++ b/Modules/Compiler/IntelLLVM-FindBinUtils.cmake @@ -19,8 +19,11 @@ get_filename_component(__intel_llvm_hint_1 "${CMAKE_${_CMAKE_PROCESSING_LANGUAGE get_filename_component(__intel_llvm_hint_1 "${__intel_llvm_hint_1}/../bin-llvm" REALPATH) get_filename_component(__intel_llvm_hint_2 "${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER}" DIRECTORY) +get_filename_component(__intel_llvm_hint_2 "${__intel_llvm_hint_2}/compiler" REALPATH) -set(__intel_llvm_hints ${__intel_llvm_hint_1} ${__intel_llvm_hint_2}) +get_filename_component(__intel_llvm_hint_3 "${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER}" DIRECTORY) + +set(__intel_llvm_hints ${__intel_llvm_hint_1} ${__intel_llvm_hint_2} ${__intel_llvm_hint_3}) # http://manpages.ubuntu.com/manpages/precise/en/man1/llvm-ar.1.html find_program(CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_AR NAMES -- cgit v0.12