summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Channings <josh.channings@musictribe.com>2023-11-24 12:51:53 (GMT)
committerJosh Channings <josh.channings@musictribe.com>2023-11-30 16:49:00 (GMT)
commit04d8a39e5c44b07bb5ca2a57756591c6280cc61d (patch)
treecfcdac0a6ed1fda28cf95bd28e6ccafd46f4814b
parent7883178caef4ebf56f2ee83b07af630e0b75fe58 (diff)
downloadCMake-04d8a39e5c44b07bb5ca2a57756591c6280cc61d.zip
CMake-04d8a39e5c44b07bb5ca2a57756591c6280cc61d.tar.gz
CMake-04d8a39e5c44b07bb5ca2a57756591c6280cc61d.tar.bz2
ADSP: Use find_program() to get path to cc21k/ccblkfn
This still uses CMAKE_ADSP_ROOT as the PATHS argument, so the same behavior should be retained - but now the Platform will work without needing to supply the root, if the binaries are already in $PATH.
-rw-r--r--Modules/Platform/ADSP-Common.cmake7
1 files changed, 6 insertions, 1 deletions
diff --git a/Modules/Platform/ADSP-Common.cmake b/Modules/Platform/ADSP-Common.cmake
index 582adb5..7ec8a6f 100644
--- a/Modules/Platform/ADSP-Common.cmake
+++ b/Modules/Platform/ADSP-Common.cmake
@@ -20,7 +20,12 @@ endmacro()
macro(__platform_adsp lang)
__platform_adsp_init()
- set(CMAKE_${lang}_COMPILER "${CMAKE_ADSP_ROOT}/${CMAKE_ADSP_COMPILER_NAME}")
+ find_program(
+ CMAKE_${lang}_COMPILER
+ "${CMAKE_ADSP_COMPILER_NAME}"
+ PATHS "${CMAKE_ADSP_ROOT}"
+ REQUIRED
+ )
execute_process(
COMMAND "${CMAKE_${lang}_COMPILER}" "-proc=${CMAKE_ADSP_PROCESSOR}" "-version"